diff options
| author | Bryan McLellan <btm@loftninjas.org> | 2020-04-03 19:42:32 -0400 |
|---|---|---|
| committer | Bryan McLellan <btm@loftninjas.org> | 2020-04-03 19:42:32 -0400 |
| commit | 44295060227515ecf56e1c786706d94c84321046 (patch) | |
| tree | a5c7c2918d06b4fc686da224ca1156aba8a21142 | |
| parent | 7381df8a9fab438f47270859b09042d6dacac5e8 (diff) | |
| download | chef-44295060227515ecf56e1c786706d94c84321046.tar.gz | |
Pin omnibus-software before the change that breaks Ruby < 2.6
https://github.com/chef/omnibus-software/pull/1175 removed bundler from
a number of software definitions because Ruby 2.6+ includes bundler. But
Chef 14 still uses Ruby 2.5 so we need the bundler dependencies to get
bundle in the build.
Signed-off-by: Bryan McLellan <btm@loftninjas.org>
| -rw-r--r-- | omnibus/Gemfile | 4 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 2a12aafccb..bfe435182d 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -1,7 +1,9 @@ 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" + +# omnibus-software 52823134ba902daac1f18b1a75de0386558cc0a5 and later requires Ruby 2.6 with built in bundler +gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "91c3649a7dc1196fec7d872b731705dcf80b7c23" gem "artifactory" gem "pedump" diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index cd1b466acc..09895488d2 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,8 +18,8 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 1b490aa4e6a5b224d98d07d72cdf90cb2f132576 - branch: master + revision: 91c3649a7dc1196fec7d872b731705dcf80b7c23 + branch: 91c3649a7dc1196fec7d872b731705dcf80b7c23 specs: omnibus-software (4.0.0) omnibus (>= 5.6.1) @@ -32,7 +32,7 @@ GEM artifactory (3.0.12) awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-partitions (1.293.0) + aws-partitions (1.294.0) aws-sdk-core (3.92.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -41,7 +41,7 @@ GEM aws-sdk-kms (1.30.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.61.1) + aws-sdk-s3 (1.61.2) aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -165,9 +165,9 @@ GEM erubis (2.7.0) faraday (1.0.1) multipart-post (>= 1.2, < 3) - ffi (1.12.1) - ffi (1.12.1-x64-mingw32) - ffi (1.12.1-x86-mingw32) + ffi (1.12.2) + ffi (1.12.2-x64-mingw32) + ffi (1.12.2-x86-mingw32) ffi-win32-extensions (1.0.3) ffi ffi-yajl (2.3.3) |