summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBundlerbot <bot@bundler.io>2018-12-06 11:00:33 +0000
committerBundlerbot <bot@bundler.io>2018-12-06 11:00:33 +0000
commit8514437bb328f07e7d1152d50f97e776b6293b29 (patch)
tree15d6d09861ecdaaaa8934b03e9d1c2b0651de54b
parenta578c4ee390fadb746252b4bd496f8ee6d90add4 (diff)
parent26f36628e3b61544b8e212a8222a48deb5ac1f3c (diff)
downloadbundler-8514437bb328f07e7d1152d50f97e776b6293b29.tar.gz
Merge #6830
6830: move rubocop into a separate stage in Travis-CI r=deivid-rodriguez a=colby-swandale ## Overview This PR is pretty much a copy of https://github.com/rubygems/rubygems/pull/2510. It moves rubocop into a separate stage that is run before any tests are executed. This will allow for faster feedback and mean that we don't have to run rubocop on all our available instances in Travis. Co-authored-by: Colby Swandale <me@colby.fyi>
-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 }