summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-04-27 19:56:40 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2016-04-27 19:56:40 -0700
commit3f4c22ffc1376f7b10c542245d16cc03b55d2727 (patch)
tree86b248bce221e8df18ed802f5579b18ab2e1fa37
parentc234d6affb93eb1af6e12033d37d2e74609120de (diff)
downloadchef-3f4c22ffc1376f7b10c542245d16cc03b55d2727.tar.gz
run chefstyle in parallel, once
make it easier to see if we have style errors or code errors
-rw-r--r--.travis.yml3
-rwxr-xr-xtasks/bin/run_chef_tests1
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 0bbbbe579a..74826ecff6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,9 @@ matrix:
sudo: true
script: tasks/bin/run_chef_tests
bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
+ - rvm: 2.1
+ script: bundle exec rake style
+ 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
diff --git a/tasks/bin/run_chef_tests b/tasks/bin/run_chef_tests
index ea5c5beeff..a128e59aec 100755
--- a/tasks/bin/run_chef_tests
+++ b/tasks/bin/run_chef_tests
@@ -12,6 +12,5 @@ if [ -n "$1" ]; then
sudo -E $(which bundle) exec $@;
else
sudo -E $(which bundle) exec rake spec;
- bundle exec rake style;
bundle exec bundle-audit check --update;
fi