diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-01-11 14:16:20 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-11 14:16:20 -0800 |
| commit | 2ce81e548cf5a5b71ab3c1274946fc5b7a0ed5a7 (patch) | |
| tree | 30b6d30899e660f61e8ec33824462885f48b6cbe | |
| parent | 14d3f5aeb6b163cc2652db3c5724465cac9959e9 (diff) | |
| parent | 5d4298210c83120526290253fd2f2a05fe05c130 (diff) | |
| download | chef-2ce81e548cf5a5b71ab3c1274946fc5b7a0ed5a7.tar.gz | |
Merge pull request #5716 from chef/lcg/ruby-2.4
ruby-2.4 got released
| -rw-r--r-- | .travis.yml | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/.travis.yml b/.travis.yml index d2e7e91e6c..df1aa66bba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ matrix: script: sudo -E $(which bundle) exec rake spec; # 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 - - rvm: ruby-head + - rvm: 2.4.0 sudo: true script: sudo -E $(which bundle) exec rake spec; # also remove integration / external tests @@ -230,24 +230,24 @@ matrix: env: - CENTOS=7 - KITCHEN_YAML=.kitchen.travis.yml - - rvm: 2.3.3 - services: docker - sudo: required - gemfile: kitchen-tests/Gemfile - before_install: - - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2) - - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2) - bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen - before_script: - - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) - - cd kitchen-tests - script: - - bundle exec kitchen test webapp-fedora-latest - after_failure: - - cat .kitchen/logs/kitchen.log - env: - - FEDORA=latest - - KITCHEN_YAML=.kitchen.travis.yml +# - rvm: 2.3.3 +# services: docker +# sudo: required +# gemfile: kitchen-tests/Gemfile +# before_install: +# - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2) +# - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2) +# bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen +# before_script: +# - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) +# - cd kitchen-tests +# script: +# - bundle exec kitchen test webapp-fedora-latest +# after_failure: +# - cat .kitchen/logs/kitchen.log +# env: +# - FEDORA=latest +# - KITCHEN_YAML=.kitchen.travis.yml - rvm: 2.3.3 services: docker sudo: required @@ -325,7 +325,7 @@ matrix: - sudo cat /var/log/squid3/access.log allow_failures: - - rvm: ruby-head + - rvm: 2.4.0 notifications: on_change: true |