From 234779cd03baf1f9a9f189825a4f1448c674b2e9 Mon Sep 17 00:00:00 2001 From: Scott Hain Date: Fri, 9 Mar 2018 11:36:57 -0800 Subject: Use rubby 2.5 and special branch Signed-off-by: Scott Hain --- omnibus/Gemfile | 2 +- omnibus/Gemfile.lock | 20 ++++++++++---------- omnibus_overrides.rb | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 5457f0f40b..766d84ea3e 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" gem "omnibus", git: "https://github.com/chef/omnibus", branch: "master" -gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "master" +gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "shain/solaris_ruby_2_5_random" gem "pedump" diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 4ca8eb4536..3d87c10cf6 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,8 +18,8 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: f0c34cd3a21c4da6207721914213ac775b44570f - branch: master + revision: 4494cb634df14f2aec3af06c5f2a1abd8c7e70a7 + branch: shain/solaris_ruby_2_5_random specs: omnibus-software (4.0.0) chef-sugar (>= 3.4.0) @@ -31,13 +31,13 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) awesome_print (1.8.0) - aws-sdk (2.11.7) - aws-sdk-resources (= 2.11.7) - aws-sdk-core (2.11.7) + aws-sdk (2.11.11) + aws-sdk-resources (= 2.11.11) + aws-sdk-core (2.11.11) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.11.7) - aws-sdk-core (= 2.11.7) + aws-sdk-resources (2.11.11) + aws-sdk-core (= 2.11.11) aws-sigv4 (1.0.2) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) @@ -78,7 +78,7 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef-config (13.8.0) + chef-config (13.8.5) addressable fuzzyurl mixlib-config (~> 2.0) @@ -110,7 +110,7 @@ GEM ipaddress (0.8.3) jmespath (1.3.1) json (2.1.0) - kitchen-vagrant (0.19.0) + kitchen-vagrant (1.3.1) test-kitchen (~> 1.4) libyajl2 (1.2.0) license_scout (1.0.1) @@ -150,7 +150,7 @@ GEM nori (2.6.0) octokit (4.8.0) sawyer (~> 0.8.0, >= 0.5.3) - ohai (13.7.1) + ohai (13.8.0) chef-config (>= 12.5.0.alpha.1, < 14) ffi (~> 1.9) ffi-yajl (~> 2.2) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 51c5df4a01..f01e06c3f2 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -14,7 +14,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.4.3" +override "ruby", version: "2.5.0" 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" -- cgit v1.2.1