summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-04-19 09:05:59 -0700
committerJohn Keiser <john@johnkeiser.com>2016-04-19 11:38:26 -0700
commit0ce002d47405c0178b1016a8d803e13e5cfd823e (patch)
tree53f021322cdf9e864f700abf478da66027ccb1f5 /.travis.yml
parent02ec1e15c6ca5166161e2a1fb33d8d8ffefa3dc5 (diff)
downloadchef-0ce002d47405c0178b1016a8d803e13e5cfd823e.tar.gz
Re-add activesupport testsjk/activesupport-tests
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 4294f3865e..0bbbbe579a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ before_install:
- gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
- rm -f .bundle/config
-bundler_args: --without changelog compat_testing development docgen guard maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
+bundler_args: --without changelog development docgen guard maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
# do not run expensive spec tests on PRs, only on branches
branches:
@@ -26,19 +26,19 @@ matrix:
- rvm: 2.1
sudo: true
script: tasks/bin/run_chef_tests
- bundler_args: --without changelog compat_testing development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
+ bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
- rvm: 2.2
sudo: true
script: tasks/bin/run_chef_tests
- bundler_args: --without changelog compat_testing development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
+ bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
- rvm: 2.3.0
sudo: true
script: tasks/bin/run_chef_tests
- bundler_args: --without changelog compat_testing development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
+ bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
- rvm: rbx
sudo: true
script: tasks/bin/run_chef_tests
- bundler_args: --without changelog compat_testing development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
+ bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
#
# External tests
#