diff options
| author | Bryan McLellan <btm@loftninjas.org> | 2017-08-11 18:52:47 -0400 |
|---|---|---|
| committer | Bryan McLellan <btm@loftninjas.org> | 2017-08-13 12:14:21 -0400 |
| commit | 7b72d9ae77deeba02857ee29cde189872bfbb4ca (patch) | |
| tree | ccba61ee0d2dd127078a7fcc466deeb385ee2884 | |
| parent | 2faebeadaa026881e38a91336fdf00762fff09ee (diff) | |
| download | chef-7b72d9ae77deeba02857ee29cde189872bfbb4ca.tar.gz | |
Use Ruby 2.3.4 (latest 2.3) with GCC 7 Patch
Our Windows infrastructure uses GCC 7 now, so we need to patch 2.3 until 2.3.5 is released.
Signed-off-by: Bryan McLellan <btm@loftninjas.org>
| -rw-r--r-- | omnibus/Gemfile.lock | 2 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 97301f874c..3b59d8d72a 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -25,7 +25,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: ecc5d6cb06610ae5b3c098d0ad32d1d202f47b4f + revision: 52857abe96da236a6d1017b7d2ae2bd4f2c2dd8a specs: omnibus-software (4.0.0) chef-sugar (>= 3.4.0) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 8c97f16d8a..81ce296a9c 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -1,5 +1,5 @@ # DO NOT EDIT. Generated by "rake dependencies". Edit version_policy.rb instead. -override :rubygems, version: "2.6.10" +override :rubygems, version: "2.6.12" override :bundler, version: "1.12.5" override "libffi", version: "3.2.1" override "libiconv", version: "1.15" @@ -11,7 +11,7 @@ override "libyaml", version: "0.1.6" override "makedepend", version: "1.0.5" override "ncurses", version: "5.9" override "pkg-config-lite", version: "0.28-1" -override "ruby", version: "2.3.1" +override "ruby", version: "2.3.4" 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" |