diff options
| author | Tim Smith <tsmith@chef.io> | 2019-01-22 17:05:49 -0800 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2019-04-01 14:19:32 -0700 |
| commit | fbde83db83c690b57b7c49503454206ae5dc579f (patch) | |
| tree | 66c4f68a4b839e69022a1fd146307ff220d7c985 | |
| parent | 1767cecab210119d75893d065db84e4b1e6e0195 (diff) | |
| download | chef-fbde83db83c690b57b7c49503454206ae5dc579f.tar.gz | |
Install Ruby 2.6.2
Bump to the latest and greatest Ruby
Pin Rake to 12.3.2 since that's what ships in Ruby
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 8 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 2 |
4 files changed, 10 insertions, 9 deletions
@@ -53,7 +53,8 @@ group(:development, :test) do # we pin rake as a copy of rake is installed from the ruby source # if you bump the ruby version you should confirm we don't end up with # two rake gems installed again - gem "rake", "<= 12.3.0" + gem "rake", "<= 12.3.2" + gem "rspec-core", "~> 3.5" gem "rspec-mocks", "~> 3.5" gem "rspec-expectations", "~> 3.5" diff --git a/Gemfile.lock b/Gemfile.lock index feb6583034..81f91cb96d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -203,7 +203,7 @@ GEM netrc (0.11.0) octokit (4.14.0) sawyer (~> 0.8.0, >= 0.5.3) - parallel (1.16.2) + parallel (1.17.0) parser (2.6.2.0) ast (~> 2.4.0) parslet (1.8.2) @@ -228,7 +228,7 @@ GEM public_suffix (3.0.3) rack (2.0.6) rainbow (3.0.0) - rake (12.3.0) + rake (12.3.2) rb-readline (0.5.5) rspec (3.8.0) rspec-core (~> 3.8.0) @@ -366,7 +366,7 @@ DEPENDENCIES pry-byebug pry-remote pry-stack_explorer - rake (<= 12.3.0) + rake (<= 12.3.2) rb-readline rspec-core (~> 3.5) rspec-expectations (~> 3.5) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index d6557eb3cf..dc07585df8 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/chef/omnibus - revision: 096b70201d073a4aaca8f3b9faf76d4c648d05d5 + revision: 7ad32798cd5893191e4b9bfc5b53e4cc8f32646b branch: master specs: - omnibus (6.0.22) + omnibus (6.0.23) aws-sdk-s3 (~> 1) chef-sugar (>= 3.3) cleanroom (~> 1.0) @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 3d5181c28da3fdf602f86096c00d3a7c666b538c + revision: 3f3bd5dd6d17212f2b90a2e45c63bf97224b48e6 branch: master specs: omnibus-software (4.0.0) @@ -177,7 +177,7 @@ GEM kitchen-vagrant (1.5.1) test-kitchen (>= 1.4, < 3) libyajl2 (1.2.0) - license_scout (1.0.22) + license_scout (1.0.24) ffi-yajl (~> 2.2) mixlib-shellout (~> 2.2) toml-rb (~> 1.0) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index c6b4715c9c..d2fe0be149 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -17,7 +17,7 @@ override "libyaml", version: "0.1.7" override "makedepend", version: "1.0.5" override "ncurses", version: "5.9" override "pkg-config-lite", version: "0.28-1" -override "ruby", version: "2.5.5" +override "ruby", version: "2.6.2" override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18" override "util-macros", version: "1.19.0" override "xproto", version: "7.0.28" |