Skip to content

Commit

Permalink
Merge pull request #800 from chef/pin
Browse files Browse the repository at this point in the history
Pin InSpec and Train to the previous releases
  • Loading branch information
tas50 authored Dec 17, 2019
2 parents 2d24074 + d2ef1a8 commit 23e701b
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 28 deletions.
8 changes: 6 additions & 2 deletions components/gems/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ source "https://rubygems.org"

gem "bundler", "< 2"

## Until we resolve https://github.com/inspec/train/issues/548
gem "train", "=3.2.0"
gem "train-core", "=3.2.0"

group(:omnibus_package, :development, :test) do
# we pin these gems as they are installed in the ruby source and if we let them
# float we'll end up with 2 copies shipped in Workstation.
Expand Down Expand Up @@ -60,8 +64,8 @@ group(:omnibus_package) do
gem "fauxhai-ng", "~> 7.5"

# inspec
gem "inspec-bin", "~> 4.18" # the actual inspec CLI binary
gem "inspec", "~> 4.18"
gem "inspec-bin", "= 4.18.39" # the actual inspec CLI binary
gem "inspec", "= 4.18.39"

# test-kitchen and plugins
gem "test-kitchen", ">= 2.0"
Expand Down
51 changes: 26 additions & 25 deletions components/gems/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -279,10 +279,10 @@ GEM
chef-api (0.10.0)
logify (~> 0.1)
mime-types
chef-apply (0.4.11)
chef-apply (0.4.12)
chef (>= 15.0)
chef-cli (>= 1.0.3)
chef-telemetry
chef-telemetry (<= 0.1.10)
license-acceptance (~> 1.0, >= 1.0.11)
mixlib-cli
mixlib-config (>= 3.0.5)
Expand Down Expand Up @@ -316,7 +316,7 @@ GEM
mixlib-shellout (>= 2.0, < 4.0)
tomlrb (~> 1.2)
chef-sugar (5.1.9)
chef-telemetry (1.0.1)
chef-telemetry (0.1.8)
chef-config
concurrent-ruby (~> 1.0)
ffi-yajl (~> 2.2)
Expand Down Expand Up @@ -385,7 +385,7 @@ GEM
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
http-cookie (~> 1.0.0)
faraday_middleware (0.13.1)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
fauxhai-ng (7.5.1)
net-ssh
Expand Down Expand Up @@ -465,11 +465,10 @@ GEM
ice_nine (0.11.2)
inifile (3.0.0)
iniparse (1.4.4)
inspec (4.18.51)
inspec (4.18.39)
addressable (~> 2.4)
chef-telemetry (~> 1.0)
faraday (>= 0.9.0)
faraday_middleware (~> 0.12)
faraday_middleware (~> 0.12.2)
hashie (~> 3.4)
htmlentities
json-schema (~> 2.8)
Expand All @@ -480,7 +479,7 @@ GEM
parallel (~> 1.9)
parslet (~> 1.5)
pry (~> 0)
rspec (~> 3.9)
rspec (~> 3.0, < 3.9)
rspec-its (~> 1.2)
rubyzip (~> 1.2, >= 1.2.2)
semverse
Expand All @@ -494,8 +493,8 @@ GEM
train-winrm (~> 0.2)
tty-prompt (~> 0.17)
tty-table (~> 0.10)
inspec-bin (4.18.51)
inspec (= 4.18.51)
inspec-bin (4.18.39)
inspec (= 4.18.39)
ipaddress (0.8.3)
iso8601 (0.12.1)
jaro_winkler (1.5.4)
Expand Down Expand Up @@ -741,22 +740,22 @@ GEM
addressable (>= 2.3.6, < 3.0.0)
retriable (3.1.2)
retryable (3.0.5)
rspec (3.9.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-core (3.9.0)
rspec-support (~> 3.9.0)
rspec-expectations (3.9.0)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-core (3.8.2)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.6)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-support (~> 3.8.0)
rspec-its (1.3.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
rspec-mocks (3.9.0)
rspec-mocks (3.8.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.3)
rubocop (0.75.1)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
Expand Down Expand Up @@ -829,7 +828,7 @@ GEM
toml-rb (2.0.1)
citrus (~> 3.0, > 3.0)
tomlrb (1.2.9)
train (3.2.5)
train (3.2.0)
activesupport (~> 5.2.3)
azure_graph_rbac (~> 0.16)
azure_mgmt_key_vault (~> 0.17)
Expand Down Expand Up @@ -890,7 +889,7 @@ GEM
aws-sdk-sns (~> 1.9)
aws-sdk-sqs (~> 1.10)
aws-sdk-ssm (~> 1)
train-core (3.2.5)
train-core (3.2.0)
json (>= 1.8, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 3.0)
Expand Down Expand Up @@ -1045,8 +1044,8 @@ DEPENDENCIES
ffi-rzmq-core
foodcritic (>= 16.0)
guard
inspec (~> 4.18)
inspec-bin (~> 4.18)
inspec (= 4.18.39)
inspec-bin (= 4.18.39)
kitchen-azurerm (>= 0.14)
kitchen-digitalocean (>= 0.10.0)
kitchen-dokken (>= 2.8.1)
Expand Down Expand Up @@ -1087,6 +1086,8 @@ DEPENDENCIES
ruby-shadow
stove (>= 7.1.5)
test-kitchen (>= 2.0)
train (= 3.2.0)
train-core (= 3.2.0)
win32-api
win32-dir
win32-event
Expand Down
2 changes: 1 addition & 1 deletion omnibus/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ GEM
artifactory (3.0.5)
awesome_print (1.8.0)
aws-eventstream (1.0.3)
aws-partitions (1.255.0)
aws-partitions (1.256.0)
aws-sdk-core (3.86.0)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
Expand Down

0 comments on commit 23e701b

Please sign in to comment.