summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColby Swandale <me@colby.fyi>2018-12-06 20:15:07 +1100
committerColby Swandale <me@colby.fyi>2018-12-06 20:15:07 +1100
commit26f36628e3b61544b8e212a8222a48deb5ac1f3c (patch)
tree15d6d09861ecdaaaa8934b03e9d1c2b0651de54b
parenta578c4ee390fadb746252b4bd496f8ee6d90add4 (diff)
downloadbundler-26f36628e3b61544b8e212a8222a48deb5ac1f3c.tar.gz
move rubocop into a separate stage in Travis-CI
-rw-r--r--.travis.yml10
-rw-r--r--Rakefile5
2 files changed, 10 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 1a4f58b785..a195aef5b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,16 @@ rvm:
- 2.4.5
- 2.3.8
+jobs:
+ include:
+ - stage: linting
+ rvm: 2.5
+ script: rake rubocop
+
+stages:
+ - linting
+ - test
+
# Rubygems versions MUST be available as rake tasks
# see Rakefile:125 for the list of possible RGV values
env:
diff --git a/Rakefile b/Rakefile
index 5d6edbcbef..6a5ce7d327 100644
--- a/Rakefile
+++ b/Rakefile
@@ -207,11 +207,6 @@ begin
# disallow making network requests on CI
ENV["BUNDLER_SPEC_PRE_RECORDED"] = "TRUE"
- if RUBY_VERSION >= "2.0.0"
- puts "\n\e[1;33m[Travis CI] Running bundler linter\e[m\n\n"
- Rake::Task["rubocop"].invoke
- end
-
puts "\n\e[1;33m[Travis CI] Running bundler specs against RubyGems #{rg}\e[m\n\n"
specs = safe_task { Rake::Task["spec:rubygems:#{rg}"].invoke }