diff options
| author | John Keiser <john@johnkeiser.com> | 2016-08-02 15:16:28 -0700 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2016-08-02 15:16:28 -0700 |
| commit | d81c0c60a75f21b4cc12c6f6baa1398f8707e6a4 (patch) | |
| tree | 34485ae943d9b5d5b249ebc13012d1dadd444e05 | |
| parent | 767a45530b373bbd4818b93ab1efe5cd3c7da5ed (diff) | |
| download | chef-jk/update-omnibus.tar.gz | |
Use latest msys2 so we can build windows againjk/update-omnibus
| -rw-r--r-- | omnibus/Gemfile | 4 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 19 |
2 files changed, 13 insertions, 10 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 3e19adfb39..65e7e2234b 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" -gem "omnibus", git: "https://github.com/chef/omnibus.git" -gem "omnibus-software", git: "https://github.com/chef/omnibus-software.git" +gem "omnibus", git: "https://github.com/chef/omnibus.git", branch: "ksubrama/gcc_investigate" +gem "omnibus-software", git: "https://github.com/chef/omnibus-software.git", branch: "ksubrama/ruby23" # pedump pessimistically pins multipart-post to a version from 2013 which makes # bundler very unhappy. Remove this when upstream has merged zed-0xff/pedump#6 . diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index f8cfeec014..cd4483cdc2 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,13 +1,16 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: 5e767a6d220f024256439b0a8415eefe923967dc + revision: f9938ad5b52b79b6b8960f33cd2670608b499e3d + branch: ksubrama/ruby23 specs: omnibus-software (4.0.0) + chef-sugar (>= 3.4.0) omnibus (>= 5.2.0) GIT remote: https://github.com/chef/omnibus.git - revision: 29d390ec93709ceec2667038aed6769ee29a0646 + revision: 11f56485e3013ef503ac702fa438270467ae1b8c + branch: ksubrama/gcc_investigate specs: omnibus (5.4.0) aws-sdk (~> 2) @@ -38,12 +41,12 @@ GEM addressable (2.4.0) artifactory (2.3.2) awesome_print (1.7.0) - aws-sdk (2.4.2) - aws-sdk-resources (= 2.4.2) - aws-sdk-core (2.4.2) + aws-sdk (2.5.0) + aws-sdk-resources (= 2.5.0) + aws-sdk-core (2.5.0) jmespath (~> 1.0) - aws-sdk-resources (2.4.2) - aws-sdk-core (= 2.4.2) + aws-sdk-resources (2.5.0) + aws-sdk-core (= 2.5.0) berkshelf (4.3.3) addressable (~> 2.3, >= 2.3.4) berkshelf-api-client (~> 2.0, >= 2.0.2) @@ -121,7 +124,7 @@ GEM minitar (0.5.4) mixlib-authentication (1.4.1) mixlib-log - mixlib-cli (1.6.0) + mixlib-cli (1.7.0) mixlib-config (2.2.1) mixlib-install (1.0.12) artifactory |