Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unpinning train for upcoming major version release #1111

Merged
merged 8 commits into from
Apr 27, 2020
+8 −16
Merged

Unpinning train for upcoming major version release #1111

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
abbbec0
Unpinning train for upcoming major version release
tyler-ball Apr 21, 2020
f300a29
Making 'rake update' task faster by adding all 3 targets in 1 command
tyler-ball Apr 21, 2020
79b3325
Merge branch 'master' into update_train
tyler-ball Apr 21, 2020
a0abd88
Merge branch 'master' into update_train
tyler-ball Apr 22, 2020
9234624
Merge branch 'master' into update_train
tyler-ball Apr 26, 2020
8425da7
Merge branch 'master' into update_train
tyler-ball Apr 27, 2020
2bc7013
Merge branch 'master' into update_train
tyler-ball Apr 27, 2020
da63cd6
Merge branch 'master' into update_train
tyler-ball Apr 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions components/gems/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ end
group(:omnibus_package) do
gem "appbundler"

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

# Expeditor manages the version of chef released to Rubygems. We only release 'stable' chef
# gems to Rubygems now, so letting this float on latest should always give us the latest
# stable release. May have to re-pin around major version bumping time, or during patch
Expand Down
16 changes: 7 additions & 9 deletions components/gems/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,20 +842,19 @@ GEM
toml-rb (2.0.1)
citrus (~> 3.0, > 3.0)
tomlrb (1.3.0)
train (3.2.0)
train (3.2.28)
activesupport (~> 5.2.3)
azure_graph_rbac (~> 0.16)
azure_mgmt_key_vault (~> 0.17)
azure_mgmt_resources (~> 0.15)
azure_mgmt_security (~> 0.18)
azure_mgmt_storage (~> 0.18)
docker-api (~> 1.26)
google-api-client (>= 0.23.9, < 0.35.0)
googleauth (>= 0.6.6, < 0.11.0)
inifile
json (>= 1.8, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 3.0)
net-ssh (>= 2.9, < 6.0)
inifile (~> 3.0)
train-core (= 3.2.28)
train-winrm (~> 0.2)
train-aws (0.1.15)
aws-sdk-apigateway (~> 1.0)
aws-sdk-apigatewayv2 (~> 1.0)
Expand Down Expand Up @@ -903,7 +902,8 @@ GEM
aws-sdk-sns (~> 1.9)
aws-sdk-sqs (~> 1.10)
aws-sdk-ssm (~> 1.0)
train-core (3.2.0)
train-core (3.2.28)
addressable (~> 2.5)
json (>= 1.8, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 3.0)
Expand Down Expand Up @@ -1099,8 +1099,6 @@ 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
4 changes: 1 addition & 3 deletions components/gems/Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ task :update do
require "bundler"
Bundler.with_clean_env do
rm_f "Gemfile.lock"
sh "bundle _1.17.3_ lock --update --add-platform ruby"
sh "bundle _1.17.3_ lock --update --add-platform x64-mingw32"
sh "bundle _1.17.3_ lock --update --add-platform x86-mingw32"
sh "bundle _1.17.3_ lock --update --add-platform ruby x64-mingw32 x86-mingw32"
end
end