Skip to content

Commit

Permalink
Merge pull request #1500 from chef/ruby272
Browse files Browse the repository at this point in the history
Signed-off-by: Tim Smith <tsmith@chef.io>
  • Loading branch information
tas50 authored Oct 12, 2020
2 parents 23c7457 + 46a471c commit 8b64b3a
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 15 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ test_results/
tags
.DS_Store

# ruby
# ruby / bundler
Gemfile.lock
*/vendor/*

# vi
*.swp
Expand Down
27 changes: 14 additions & 13 deletions omnibus/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
GIT
remote: https://github.com/chef/omnibus-software.git
revision: 0e0686b82299ca2ddc6b9251319e4309142c4b7d
revision: e5ac48a1cd931b5f1931e9828713e32718fd36e6
branch: master
specs:
omnibus-software (4.0.0)
omnibus (>= 5.6.1)

GIT
remote: https://github.com/chef/omnibus.git
revision: 9ac2c38cf3741c5ec009fa2087498ea5b58104df
revision: 477c7078259f97d9957854385525ede69cd1156c
branch: master
specs:
omnibus (7.0.26)
omnibus (7.0.31)
aws-sdk-s3 (~> 1)
chef-cleanroom (~> 1.0)
chef-sugar (>= 3.3)
ffi-yajl (~> 2.2)
license_scout (~> 1.0)
mixlib-shellout (>= 2.0, < 4.0)
mixlib-versioning
ohai (>= 13, < 17)
ohai (>= 15)
pedump
ruby-progressbar (~> 1.7)
thor (>= 0.18, < 2.0)
Expand All @@ -32,17 +32,17 @@ GEM
artifactory (3.0.15)
awesome_print (1.8.0)
aws-eventstream (1.1.0)
aws-partitions (1.377.0)
aws-sdk-core (3.108.0)
aws-partitions (1.381.0)
aws-sdk-core (3.109.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.38.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sdk-kms (1.39.0)
aws-sdk-core (~> 3, >= 3.109.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.81.1)
aws-sdk-core (~> 3, >= 3.104.3)
aws-sdk-s3 (1.83.0)
aws-sdk-core (~> 3, >= 3.109.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.2)
Expand Down Expand Up @@ -204,7 +204,7 @@ GEM
tomlrb (~> 1.2)
tty-box (~> 0.6)
tty-prompt (~> 0.20)
license_scout (1.1.11)
license_scout (1.2.2)
ffi-yajl (~> 2.2)
mixlib-shellout (>= 2.2, < 4.0)
toml-rb (>= 1, < 3)
Expand Down Expand Up @@ -310,15 +310,16 @@ GEM
toml-rb (2.0.1)
citrus (~> 3.0, > 3.0)
tomlrb (1.3.0)
train-core (3.3.21)
train-core (3.3.24)
addressable (~> 2.5)
ffi (!= 1.13.0)
json (>= 1.8, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 4.0)
net-ssh (>= 2.9, < 7.0)
train-winrm (0.2.6)
train-winrm (0.2.11)
winrm (~> 2.0)
winrm-elevated (~> 1.2.2)
winrm-fs (~> 1.0)
tty-box (0.6.0)
pastel (~> 0.8)
Expand Down
2 changes: 1 addition & 1 deletion omnibus_overrides.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
override "ncurses", version: "5.9"
override "openssl", version: "1.0.2w"
override "pkg-config-lite", version: "0.28-1"
override "ruby", version: "2.7.1"
override "ruby", version: "2.7.2"
override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"
override "rust", version: "1.37.0"
override "util-macros", version: "1.19.0"
Expand Down

0 comments on commit 8b64b3a

Please sign in to comment.