summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-08-10 15:07:58 -0700
committerJohn Keiser <john@johnkeiser.com>2016-08-17 11:43:49 -0700
commit025b08922c3d3d1cd03082b3d6e826859861aa31 (patch)
treea0f88bfc473b23b7cd1e24a3fd9fd70634ec5bf5
parent505a2baac3039b21ceb3fd815ccaeeba0321d1d8 (diff)
downloadchef-025b08922c3d3d1cd03082b3d6e826859861aa31.tar.gz
Use Ruby 2.3.1 in Travis and Appveyor
-rw-r--r--.travis.yml42
-rw-r--r--appveyor.yml5
2 files changed, 23 insertions, 24 deletions
diff --git a/.travis.yml b/.travis.yml
index dfee9acd79..d8ff98ad7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,13 +52,13 @@ matrix:
bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
- env:
CHEFSTYLE: 1
- rvm: 2.2.5
+ rvm: 2.3.1
script: bundle exec rake style
# also remove integration / external tests
bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
- env:
AUDIT_CHECK: 1
- rvm: 2.2.5
+ rvm: 2.3.1
script: bundle exec bundle-audit check --update
# also remove integration / external tests
bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
@@ -68,23 +68,23 @@ matrix:
- env:
TEST_GEM: chef-provisioning
script: tasks/bin/run_external_test $TEST_GEM rake spec
- rvm: 2.2.5
+ rvm: 2.3.1
- env:
TEST_GEM: chef-provisioning-aws
script: tasks/bin/run_external_test $TEST_GEM rake spec
- rvm: 2.2.5
+ rvm: 2.3.1
- env:
TEST_GEM: chef-sugar
script: tasks/bin/run_external_test $TEST_GEM rake
- rvm: 2.2.5
+ rvm: 2.3.1
- env:
- TEST_GEM: chef-zero
script: tasks/bin/run_external_test $TEST_GEM rake spec cheffs
- rvm: 2.2.5
+ rvm: 2.3.1
- env:
TEST_GEM: cheffish
script: tasks/bin/run_external_test $TEST_GEM rake spec
- rvm: 2.2.5
+ rvm: 2.3.1
- env:
TEST_GEM: chefspec
# The chefspec tests + bundler cache + "gem update --system" interact badly :/
@@ -93,26 +93,26 @@ matrix:
- gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
- bundle config --local without server:docgen:maintenance:omnibus_package:development:ruby_prof:pry
script: tasks/bin/run_external_test $TEST_GEM rake
- rvm: 2.2.5
+ rvm: 2.3.1
- env:
TEST_GEM: foodcritic
script: tasks/bin/run_external_test $TEST_GEM rake test
- rvm: 2.2.5
+ rvm: 2.3.1
- env:
TEST_GEM: halite
script: tasks/bin/run_external_test $TEST_GEM rake spec
- rvm: 2.2.5
+ rvm: 2.3.1
- env:
TEST_GEM: knife-windows
script: tasks/bin/run_external_test $TEST_GEM rake unit_spec
- rvm: 2.2.5
+ rvm: 2.3.1
- env:
TEST_GEM: poise
script: tasks/bin/run_external_test $TEST_GEM rake spec
- rvm: 2.2.5
+ rvm: 2.3.1
### START TEST KITCHEN ONLY ###
#
- - rvm: 2.2.5
+ - rvm: 2.3.1
services: docker
sudo: required
gemfile: kitchen-tests/Gemfile
@@ -129,7 +129,7 @@ matrix:
env:
- UBUNTU=12.04
- KITCHEN_YAML=.kitchen.travis.yml
- - rvm: 2.2.5
+ - rvm: 2.3.1
services: docker
sudo: required
gemfile: kitchen-tests/Gemfile
@@ -146,7 +146,7 @@ matrix:
env:
- UBUNTU=14.04
- KITCHEN_YAML=.kitchen.travis.yml
- - rvm: 2.2.5
+ - rvm: 2.3.1
services: docker
sudo: required
gemfile: kitchen-tests/Gemfile
@@ -163,7 +163,7 @@ matrix:
env:
- UBUNTU=16.04
- KITCHEN_YAML=.kitchen.travis.yml
- - rvm: 2.2.5
+ - rvm: 2.3.1
services: docker
sudo: required
gemfile: kitchen-tests/Gemfile
@@ -180,7 +180,7 @@ matrix:
env:
- DEBIAN=7
- KITCHEN_YAML=.kitchen.travis.yml
- - rvm: 2.2.5
+ - rvm: 2.3.1
services: docker
sudo: required
gemfile: kitchen-tests/Gemfile
@@ -197,7 +197,7 @@ matrix:
env:
- DEBIAN=8
- KITCHEN_YAML=.kitchen.travis.yml
- - rvm: 2.2.5
+ - rvm: 2.3.1
services: docker
sudo: required
gemfile: kitchen-tests/Gemfile
@@ -214,7 +214,7 @@ matrix:
env:
- CENTOS=6
- KITCHEN_YAML=.kitchen.travis.yml
- - rvm: 2.2.5
+ - rvm: 2.3.1
services: docker
sudo: required
gemfile: kitchen-tests/Gemfile
@@ -231,7 +231,7 @@ matrix:
env:
- CENTOS=7
- KITCHEN_YAML=.kitchen.travis.yml
- - rvm: 2.2.5
+ - rvm: 2.3.1
services: docker
sudo: required
gemfile: kitchen-tests/Gemfile
@@ -249,7 +249,7 @@ matrix:
- FEDORA=23
- KITCHEN_YAML=.kitchen.travis.yml
### END TEST KITCHEN ONLY ###
- - rvm: 2.2.5
+ - rvm: 2.3.1
sudo: required
dist: trusty
before_install:
diff --git a/appveyor.yml b/appveyor.yml
index 8a348295da..831ecf67e5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,9 +6,8 @@ platform:
environment:
matrix:
- # 21-x64 is failing right now
- # - ruby_version: "21-x64"
- - ruby_version: "21"
+ - ruby_version: "23-x64"
+ - ruby_version: "23"
clone_folder: c:\projects\chef
clone_depth: 1