diff options
| author | Thom May <thom@may.lt> | 2016-04-28 10:01:27 +0100 |
|---|---|---|
| committer | Thom May <thom@may.lt> | 2016-04-28 10:01:27 +0100 |
| commit | f457f3d877a147cdafa4a79f0ca13f7e0e4e20ff (patch) | |
| tree | ec94a14e7d40e1eb5f664cf00f521e75ad7604a3 | |
| parent | c234d6affb93eb1af6e12033d37d2e74609120de (diff) | |
| parent | dc3ad1546ac11fda509908bb472bb646e713284a (diff) | |
| download | chef-f457f3d877a147cdafa4a79f0ca13f7e0e4e20ff.tar.gz | |
Merge pull request #4875 from chef/lcg/run-chefstyle-isolated
run chefstyle in parallel, once
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rwxr-xr-x | tasks/bin/run_chef_tests | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 0bbbbe579a..0d977ece31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,11 @@ 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 + - env: + CHEFSTYLE: 1 + 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 |