diff options
| author | Lamont Granquist <lamont@chef.io> | 2020-03-05 20:18:22 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-05 20:18:22 -0800 |
| commit | 465909784f799fc0ab88944e8021075244da1301 (patch) | |
| tree | 8dc2ad3e77e29a45694f1620574a63c956dfa276 | |
| parent | e06e4ae6833fb2ef7cadd154130914aaf300420d (diff) | |
| parent | 32855464f546b7b241b9def964fc0529498b1d33 (diff) | |
| download | chef-465909784f799fc0ab88944e8021075244da1301.tar.gz | |
Merge pull request #9454 from chef/lcg/ruby-2.7-5
Ruby 2.7 omnibus builds
| -rw-r--r-- | .expeditor/release.omnibus.yml | 8 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 16 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/.expeditor/release.omnibus.yml b/.expeditor/release.omnibus.yml index b19f3fc0cc..4e365a5c7b 100644 --- a/.expeditor/release.omnibus.yml +++ b/.expeditor/release.omnibus.yml @@ -41,10 +41,10 @@ builder-to-testers-map: sles-12-x86_64: - sles-12-x86_64 - sles-15-x86_64 - solaris2-5.11-i386: - - solaris2-5.11-i386 - solaris2-5.11-sparc: - - solaris2-5.11-sparc +# solaris2-5.11-i386: +# - solaris2-5.11-i386 +# solaris2-5.11-sparc: +# - solaris2-5.11-sparc ubuntu-16.04-x86_64: - ubuntu-16.04-x86_64 - ubuntu-18.04-x86_64 diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index daa7c789d4..4087d4150f 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/chef/omnibus - revision: f38dcb57017e007c7e98a9934e881904a5e09907 + revision: f389917504c20839ff9607df63fb2e59e2c31b52 branch: master specs: - omnibus (7.0.6) + omnibus (7.0.7) aws-sdk-s3 (~> 1) chef-cleanroom (~> 1.0) chef-sugar (>= 3.3) @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 722d2a8b7f74b98ee44efadac6d74daa5559a48d + revision: c086d8057ac9a15486fe2010009db0dee1cea682 branch: master specs: omnibus-software (4.0.0) @@ -32,7 +32,7 @@ GEM artifactory (3.0.12) awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-partitions (1.278.0) + aws-partitions (1.280.0) aws-sdk-core (3.90.1) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -215,7 +215,7 @@ GEM mixlib-cli (2.1.5) mixlib-config (3.0.6) tomlrb - mixlib-install (3.11.26) + mixlib-install (3.11.28) mixlib-shellout mixlib-versioning thor @@ -290,7 +290,7 @@ GEM structured_warnings (0.4.0) syslog-logger (1.6.8) systemu (2.6.5) - test-kitchen (2.3.4) + test-kitchen (2.4.0) bcrypt_pbkdf (~> 1.0) ed25519 (~> 1.2) license-acceptance (~> 1.0, >= 1.0.11) @@ -307,7 +307,7 @@ GEM toml-rb (2.0.1) citrus (~> 3.0, > 3.0) tomlrb (1.2.9) - train-core (3.2.22) + train-core (3.2.23) addressable (~> 2.5) inifile (~> 3.0) json (>= 1.8, < 3.0) @@ -398,4 +398,4 @@ DEPENDENCIES winrm-fs (~> 1.0) BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 016c8bc111..1243714975 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -15,10 +15,10 @@ override "libxslt", version: "1.1.34" override "libyaml", version: "0.1.7" override "makedepend", version: "1.0.5" override "ncurses", version: "5.9" -override "nokogiri", version: "1.10.8" +override "nokogiri", version: "1.11.0.rc1" override "openssl", version: "1.0.2u" override "pkg-config-lite", version: "0.28-1" -override "ruby", version: "2.6.5" +override "ruby", version: "2.7.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" |