diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-04-28 17:42:57 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-04-28 17:43:34 -0700 |
| commit | eaf5accfda1314f40468d6f8af36305b01ba61dc (patch) | |
| tree | 5d32bd3b9260c4ac79f2f3fa26caa36f232c23a0 | |
| parent | 4ad6a60f80d3a191f64382fb53a77fe662538759 (diff) | |
| download | chef-eaf5accfda1314f40468d6f8af36305b01ba61dc.tar.gz | |
give bundle audit its own run
and extract most config back out into .travis.yml
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rwxr-xr-x | tasks/bin/run_chef_tests | 12 |
2 files changed, 10 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index f74f427185..d120937c61 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,11 @@ before_install: bundler_args: --without changelog development docgen guard maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen +before_script: + - echo --color > .rspec + - echo -fp >> .rspec + - sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers; + # do not run expensive spec tests on PRs, only on branches branches: only: @@ -36,6 +41,10 @@ matrix: CHEFSTYLE: 1 rvm: 2.1 script: bundle exec rake style + - env: + AUDIT_CHECK: 1 + rvm: 2.1 + script: bundle exec bundle-audit check --update - 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 a128e59aec..363086e688 100755 --- a/tasks/bin/run_chef_tests +++ b/tasks/bin/run_chef_tests @@ -3,14 +3,4 @@ # Fail fast (e) and echo commands (vx) set -evx -echo --color > .rspec -echo -fp >> .rspec - -sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers; -# If we have any args, just run the given command -if [ -n "$1" ]; then - sudo -E $(which bundle) exec $@; -else - sudo -E $(which bundle) exec rake spec; - bundle exec bundle-audit check --update; -fi +sudo -E $(which bundle) exec rake spec; |