diff options
author | Tim Smith <tsmith@chef.io> | 2018-10-23 06:13:42 -0700 |
---|---|---|
committer | Tim Smith <tsmith@chef.io> | 2018-10-23 06:14:42 -0700 |
commit | ee9fa0dc0c37655f195c13c2fa635f85758b10a5 (patch) | |
tree | 671c79c5a3e0db86e75dca5b8908ddd8ab2118ba | |
parent | f8bdea09665550e79d9415ec419a3269d7c8842d (diff) | |
download | chef-ee9fa0dc0c37655f195c13c2fa635f85758b10a5.tar.gz |
Update Ruby to 2.5.3
This resolves several CVEs and fixes a large number of bugs.
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r-- | .travis.yml | 50 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 10 | ||||
-rw-r--r-- | omnibus_overrides.rb | 2 |
3 files changed, 32 insertions, 30 deletions
diff --git a/.travis.yml b/.travis.yml index c8dddde585..3d97bc5ed9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,7 @@ matrix: bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - env: INTEGRATION_SPECS_25: 1 - rvm: 2.5.1 + rvm: 2.5.3 sudo: true script: sudo -E $(which bundle) exec rake spec:integration; bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen @@ -54,7 +54,7 @@ matrix: bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - env: FUNCTIONAL_SPECS_25: 1 - rvm: 2.5.1 + rvm: 2.5.3 sudo: true script: sudo -E $(which bundle) exec rake spec:functional; bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen @@ -68,7 +68,7 @@ matrix: bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - env: UNIT_SPECS_25: 1 - rvm: 2.5.1 + rvm: 2.5.3 sudo: true script: - sudo -E $(which bundle) exec rake spec:unit; @@ -76,7 +76,7 @@ matrix: bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - env: CHEFSTYLE: 1 - rvm: 2.5.1 + rvm: 2.5.3 script: bundle exec rake style # also remove integration / external tests bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen @@ -86,36 +86,36 @@ matrix: - env: TEST_GEM: sethvargo/chef-sugar script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake - rvm: 2.5.1 + rvm: 2.5.3 - env: - PEDANT_OPTS=--skip-oc_id - TEST_GEM=chef/chef-zero - CHEF_FS=true script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake pedant - rvm: 2.5.1 + rvm: 2.5.3 - env: TEST_GEM: chef/cheffish script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec - rvm: 2.5.1 + rvm: 2.5.3 - env: TEST_GEM: chefspec/chefspec script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake - rvm: 2.5.1 + rvm: 2.5.3 - env: TEST_GEM: poise/halite script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec - rvm: 2.5.1 + rvm: 2.5.3 - env: TEST_GEM: chef/knife-windows script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake unit_spec - rvm: 2.5.1 + rvm: 2.5.3 # disable this pending a Chef 14 compat version of poise # - env: # TEST_GEM: poise/poise # script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec - # rvm: 2.5.1 + # rvm: 2.5.3 ### START TEST KITCHEN ONLY ### - - rvm: 2.5.1 + - rvm: 2.5.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -132,7 +132,7 @@ matrix: env: - AMAZON=2 - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.1 + - rvm: 2.5.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -149,7 +149,7 @@ matrix: env: - AMAZON=201X - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.1 + - rvm: 2.5.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -166,7 +166,7 @@ matrix: env: - UBUNTU=14.04 - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.1 + - rvm: 2.5.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -183,7 +183,7 @@ matrix: env: - UBUNTU=16.04 - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.1 + - rvm: 2.5.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -200,7 +200,7 @@ matrix: env: - UBUNTU=18.04 - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.1 + - rvm: 2.5.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -217,7 +217,7 @@ matrix: env: - DEBIAN=8 - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.1 + - rvm: 2.5.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -234,7 +234,7 @@ matrix: env: - DEBIAN=9 - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.1 + - rvm: 2.5.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -251,7 +251,7 @@ matrix: env: - CENTOS=6 - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.1 + - rvm: 2.5.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -268,7 +268,7 @@ matrix: env: - CENTOS=7 - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.1 + - rvm: 2.5.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -285,7 +285,7 @@ matrix: env: - FEDORA=latest - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.1 + - rvm: 2.5.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -302,7 +302,7 @@ matrix: env: - OPENSUSELEAP=42 - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.1 + - rvm: 2.5.3 sudo: required before_install: - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2) @@ -323,7 +323,7 @@ matrix: - sudo cat /var/log/squid3/access.log # Use test-kitchen to launch a centos docker container to run the full rspec tests against. This catches # errors in travis, before PRs are merged, hopefully before they become errors in jenkins. - - rvm: 2.5.1 + - rvm: 2.5.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -340,7 +340,7 @@ matrix: env: - RSPEC_CENTOS=7 - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.1 + - rvm: 2.5.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 9a8a008453..706554ebd8 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 1736d68a4efe36db6287c34b1d9d3c8226dfd4f3 + revision: ec8df13fa165b7d3866ee61fc05f060283adc642 branch: master specs: omnibus-software (4.0.0) @@ -32,8 +32,8 @@ GEM public_suffix (>= 2.0.2, < 4.0) awesome_print (1.8.0) aws-eventstream (1.0.1) - aws-partitions (1.105.0) - aws-sdk-core (3.31.0) + aws-partitions (1.106.0) + aws-sdk-core (3.33.0) aws-eventstream (~> 1.0) aws-partitions (~> 1.0) aws-sigv4 (~> 1.0) @@ -193,6 +193,8 @@ GEM minitar (0.6.1) mixlib-archive (0.4.18) mixlib-log + mixlib-archive (0.4.18-universal-mingw32) + mixlib-log mixlib-authentication (2.1.1) mixlib-cli (1.7.0) mixlib-config (2.2.13) @@ -377,4 +379,4 @@ DEPENDENCIES winrm-fs (~> 1.0) BUNDLED WITH - 1.16.5 + 1.16.6 diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index f041047593..2499452a44 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -17,7 +17,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.5.1" +override "ruby", version: "2.5.3" 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" |