summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2016-01-12 15:26:52 +0000
committerThom May <thom@chef.io>2016-01-12 15:26:52 +0000
commit80cc0467f69f1e27a96bf11e4177bacf9d9a8e98 (patch)
treec3112c18053a232d8ab7f261d804f82962fbbf5f
parente3400c0b6c53c5ba11657f21abffb1f72408d4a9 (diff)
downloadchef-tm/add_chefstyle.tar.gz
exclude vendor dirtm/add_chefstyle
-rw-r--r--.rubocop.yml1
-rw-r--r--.travis.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 36782c7693..c4272bd0f4 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,3 +1,4 @@
AllCops:
Exclude:
- "spec/data/**/*"
+ - "vendor/**/*"
diff --git a/.travis.yml b/.travis.yml
index c719407c32..cd91884f68 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ branches:
# do not run expensive spec tests on PRs, only on branches
script: "
+set -e;
bundle exec rake style;
echo '--color\n-fp' > .rspec;
sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers;