Merge pull request #8446 from chef/new_ruby

Update to Ruby 2.6.3

3 files changed, 25 insertions, 25 deletions

diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index b109acc4ba..86ff934af0 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -9,7 +9,7 @@ steps:
 #     - /workdir/scripts/bk_tests/bk_install.sh
 #     - sed '/ip6/d' /etc/hosts > /etc/hosts.noip6
 #     - cp /etc/hosts.noip6 /etc/hosts
-#     - cd /workdir; bundle install --without ci docgen guard integration omnibus_package --frozen
+#     - cd /workdir; bundle install --without docgen integration omnibus_package --frozen
 #     - bundle exec rake spec:integration
 #   expeditor:
 #     executor:
@@ -25,7 +25,7 @@ steps:
 #     - /workdir/scripts/bk_tests/bk_install.sh
 #     - sed '/ip6/d' /etc/hosts > /etc/hosts.noip6
 #     - cp /etc/hosts.noip6 /etc/hosts
-#     - cd /workdir; bundle install --without ci docgen guard integration omnibus_package --frozen
+#     - cd /workdir; bundle install --without docgen integration omnibus_package --frozen
 #     - bundle exec rake spec:functional
 #   expeditor:
 #     executor:
@@ -38,7 +38,7 @@ steps:
 - label: "Unit Specs :ruby: 2.6"
   commands:
     - /workdir/scripts/bk_tests/bk_install.sh
-    - bundle install --without ci docgen guard integration omnibus_package --frozen
+    - bundle install --without docgen integration omnibus_package --frozen
     - bundle exec rake spec:unit
     - bundle exec rake component_specs
   expeditor:
@@ -138,7 +138,7 @@ steps:
 #     - asdf local ruby 2.5.5
 #     - sed '/ip6/d' /etc/hosts > /etc/hosts.noip6
 #     - cp /etc/hosts.noip6 /etc/hosts
-#     - bundle install --without ci docgen guard integration omnibus_package --frozen
+#     - bundle install --without docgen integration omnibus_package --frozen
 #     - bundle exec rake spec:integration
 #   expeditor:
 #     executor:
@@ -154,7 +154,7 @@ steps:
 #     - /workdir/scripts/bk_tests/bk_install.sh
 #     - sed '/ip6/d' /etc/hosts > /etc/hosts.noip6
 #     - cp /etc/hosts.noip6 /etc/hosts
-#     - bundle install --without ci docgen guard integration omnibus_package --frozen
+#     - bundle install --without docgen integration omnibus_package --frozen
 #     - bundle exec rake spec:functional
 #   expeditor:
 #     executor:
@@ -168,7 +168,7 @@ steps:
   commands:
     - asdf local ruby 2.5.5
     - /workdir/scripts/bk_tests/bk_install.sh
-    - bundle install --without ci docgen guard integration omnibus_package --frozen
+    - bundle install --without docgen integration omnibus_package --frozen
     - bundle exec rake spec:unit
     - bundle exec rake component_specs
   expeditor:
diff --git a/.travis.yml b/.travis.yml
index a752cf9318..48892c1dbe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,26 +38,26 @@ matrix:
     rvm: 2.5.5
     sudo: true
     script: sudo -E $(which bundle) exec rake spec:integration;
-    bundler_args: --without ci docgen guard integration omnibus_package --frozen
+    bundler_args: --without docgen integration omnibus_package --frozen
   - env:
       INTEGRATION_SPECS_26: 1
-    rvm: 2.6.2
+    rvm: 2.6.3
     sudo: true
     script: sudo -E $(which bundle) exec rake spec:integration;
-    bundler_args: --without ci docgen guard integration omnibus_package --frozen
+    bundler_args: --without docgen integration omnibus_package --frozen
   - env:
       FUNCTIONAL_SPECS_25: 1
     rvm: 2.5.5
     sudo: true
     # the travis apt proxy screws with our functional testing something fierce
     script: sudo rm -f /etc/apt/apt.conf.d/99-travis-apt-proxy; sudo -E $(which bundle) exec rake spec:functional;
-    bundler_args: --without ci docgen guard integration omnibus_package --frozen
+    bundler_args: --without docgen integration omnibus_package --frozen
   - env:
       FUNCTIONAL_SPECS_26: 1
-    rvm: 2.6.2
+    rvm: 2.6.3
     sudo: true
     script: sudo rm -f /etc/apt/apt.conf.d/99-travis-apt-proxy; sudo -E $(which bundle) exec rake spec:functional;
-    bundler_args: --without ci docgen guard integration omnibus_package --frozen
+    bundler_args: --without docgen integration omnibus_package --frozen
   - env:
       UNIT_SPECS_25: 1
     rvm: 2.5.5
@@ -65,50 +65,50 @@ matrix:
     script:
       - sudo -E $(which bundle) exec rake spec:unit;
       - sudo -E $(which bundle) exec rake component_specs
-    bundler_args: --without ci docgen guard integration omnibus_package --frozen
+    bundler_args: --without docgen integration omnibus_package --frozen
   - env:
       UNIT_SPECS_26: 1
-    rvm: 2.6.2
+    rvm: 2.6.3
     sudo: true
     script:
       - sudo -E $(which bundle) exec rake spec:unit;
       - sudo -E $(which bundle) exec rake component_specs
-    bundler_args: --without ci docgen guard integration omnibus_package --frozen
+    bundler_args: --without docgen integration omnibus_package --frozen
   - env:
       CHEFSTYLE: 1
-    rvm: 2.6.2
+    rvm: 2.6.3
     script: bundle exec rake style
     # also remove integration / external tests
-    bundler_args: --without ci docgen guard integration omnibus_package --frozen
+    bundler_args: --without docgen integration omnibus_package --frozen
   #
   # External tests
   #
   - env:
       TEST_GEM: sethvargo/chef-sugar
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake
-    rvm: 2.6.2
+    rvm: 2.6.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.6.2
+    rvm: 2.6.3
   - env:
       TEST_GEM: chef/cheffish
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec
-    rvm: 2.6.2
+    rvm: 2.6.3
   - env:
       TEST_GEM: chefspec/chefspec
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake
-    rvm: 2.6.2
+    rvm: 2.6.3
   - env:
       TEST_GEM: poise/halite
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec
-    rvm: 2.6.2
+    rvm: 2.6.3
   - env:
       TEST_GEM: chef/knife-windows
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake unit_spec
-    rvm: 2.6.2
+    rvm: 2.6.3
   ### START TEST KITCHEN ONLY ###
   - rvm: 2.5.5
     services: docker
@@ -361,7 +361,7 @@ matrix:
     - env:
         TEST_GEM: poise/halite
       script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec
-      rvm: 2.6.2
+      rvm: 2.6.3
 
 notifications:
   on_change: true
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 0e17ce03fb..d2a94f7932 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.6.2"
+override "ruby", version: "2.6.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"