Merge pull request #5144 from inspec/ns/fix_ruby_2_4

Pin json_schemer to maintain Ruby 2.4 support
This commit is contained in:
Nick Schwaderer 2020-07-16 15:08:42 +01:00 committed by GitHub
commit 08bc5edfaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 13 deletions

View file

@ -44,18 +44,19 @@ pipelines:
- integration/resources:
description: Test core resources with test-kitchen.
definition: .expeditor/integration.resources.yml
- integration/libraries:
description: Integration with plugins, gems, resource packs.
definition: .expeditor/integration.libraries.yml
- integration/profiles:
description: Integration with compliance-profiles, and dev-sec
definition: .expeditor/integration.profiles.yml
- integration/cookbooks:
description: Integration with the audit cookbook
definition: .expeditor/integration.cookbooks.yml
- integration/automate:
description: Integration with Chef Automate
definition: .expeditor/integration.automate.yml
# This breaks expeditor as it does not yet exist
# - integration/libraries:
# description: Integration with plugins, gems, resource packs.
# definition: .expeditor/integration.libraries.yml
# - integration/profiles:
# description: Integration with compliance-profiles, and dev-sec
# definition: .expeditor/integration.profiles.yml
# - integration/cookbooks:
# description: Integration with the audit cookbook
# definition: .expeditor/integration.cookbooks.yml
# - integration/automate:
# description: Integration with Chef Automate
# definition: .expeditor/integration.automate.yml
- artifact/habitat:
description: Execute tests against the habitat artifact
definition: .expeditor/artifact.habitat.yml

View file

@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "chef-telemetry", "~> 1.0"
spec.add_dependency "license-acceptance", ">= 0.2.13", "< 2.0"
spec.add_dependency "thor", ">= 0.20", "< 2.0"
spec.add_dependency "json_schemer", "~> 0.2.1"
spec.add_dependency "json_schemer", ">= 0.2.1", "< 0.2.12"
spec.add_dependency "method_source", ">= 0.8", "< 2.0"
spec.add_dependency "rubyzip", "~> 1.2", ">= 1.2.2"
spec.add_dependency "rspec", "~> 3.9"