From b10143397714d690a4584a8e5ae55490f01370e8 Mon Sep 17 00:00:00 2001
From: ojab <ojab@ojab.ru>
Date: Fri, 27 Apr 2018 13:07:46 +0000
Subject: [PATCH] Drop stuff from travis

---
 .travis.yml                | 50 +++-----------------------------------
 Rakefile                   |  5 ----
 spec/runtime/setup_spec.rb |  2 +-
 spec/spec_helper.rb        |  2 +-
 4 files changed, 5 insertions(+), 54 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 543df2bcda5..13192d80f55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+sudo: requred
 language: ruby
 script: rake spec:travis
 before_script:
@@ -6,57 +7,12 @@ before_script:
   - travis_retry rake man:build
   - travis_retry rake spec:rubygems:clone_rubygems_$RGV
 
-branches:
-  only:
-    - master
-    - auto
-    - /.+-dev$/
-    - /.+-stable$/
-
-notifications:
-  slack:
-    on_success: change
-    on_failure: always
-    rooms:
-      - secure: JxBi7DDJGkIF/7f/FSN/HUHpvV4EKfQccZHTPd1b2pNJn3GXo6u+tNVbAw2WjxYzPyPQI3ZcYBCU9SEXp/i7VmG8uMzh8Kyildw+miSKYKVb90uYqcsXWzbxwyNBgJLvyDkzST45H5lgnyAicee3WkFes/WDZikIajbH7ztdb04=
-
-addons:
-  code_climate:
-    repo_token:
-      secure: "TrzIv116JLGUxm6PAUskCYrv8KTDguncKROVwbnjVPKTGDAgoDderd8JUdDEXrKoZ9qGLD2TPYKExt9/QDl71E+qHdWnVqWv4HKCUk2P9z/VLKzHuggOUBkCXiJUhjywUieCJhI3N92bfq2EjSBbu2/OFHqWOjLQ+QCooTEBjv8="
-
 rvm:
-  - 2.5.0
-  - 2.4.3
-  - 2.3.6
-
-# Rubygems versions MUST be available as rake tasks
-# see Rakefile:125 for the list of possible RGV values
+  - 2.5.1
 env:
-  # We need to know if changes to rubygems will break bundler on release
-  - RGV=master
-  # Test the latest rubygems release with all of our supported rubies
   - RGV=v2.7.4
 
 matrix:
   include:
-    # Ruby 2.4, Rubygems 2.6.8 and up
-    - rvm: 2.4.2
-      env: RGV=v2.6.14
-    # Ruby 2.3, Rubygems 2.5.1 and up
-    - rvm: 2.3.5
-      env: RGV=v2.5.2
-    - rvm: 2.3.5
+    - rvm: 2.5.1
       env: RGV=v2.6.14
-    # Ruby-head (we want to know how we're doing, but not fail the build)
-    - rvm: ruby-head
-      env: RGV=master
-    # 1.x mode (we want to keep stuff passing in 1.x mode for now)
-    - rvm: 2.4.2
-      env: RGV=v2.7.4 BUNDLER_SPEC_SUB_VERSION=1.98
-    - rvm: 1.8.7
-      env: RGV=v2.7.4 BUNDLER_SPEC_SUB_VERSION=1.98
-
-  allow_failures:
-    - rvm: ruby-head
-      env: RGV=master
diff --git a/Rakefile b/Rakefile
index dcecf91165a..bc7372e75b3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -213,11 +213,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 }
 
diff --git a/spec/runtime/setup_spec.rb b/spec/runtime/setup_spec.rb
index 68fab23a943..8ff8224167e 100644
--- a/spec/runtime/setup_spec.rb
+++ b/spec/runtime/setup_spec.rb
@@ -857,7 +857,7 @@ def clean_load_path(lp)
     expect(out).to eq("true\ntrue")
   end
 
-  context "with bundler is located in symlinked GEM_HOME" do
+  context "with bundler is located in symlinked GEM_HOME", :focus => true do
     let(:gem_home) { Dir.mktmpdir }
     let(:symlinked_gem_home) { Tempfile.new }
     let(:bundler_dir) { File.expand_path("../..", __dir__) }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 228b9e5aa3a..4c630cafd7c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -105,7 +105,7 @@ module Gem
   config.filter_run_excluding :rubygems_master => (ENV["RGV"] != "master")
   config.filter_run_excluding :bundler => LessThanProc.with(Bundler::VERSION.split(".")[0, 2].join("."))
 
-  config.filter_run_when_matching :focus unless ENV["CI"]
+  config.filter_run_when_matching :focus
 
   original_wd  = Dir.pwd
   original_env = ENV.to_hash.delete_if {|k, _v| k.start_with?(Bundler::EnvironmentPreserver::BUNDLER_PREFIX) }