diff options
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | Rakefile | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index f34ea4ca81..bd2d1e5dcc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ addons: secure: "TrzIv116JLGUxm6PAUskCYrv8KTDguncKROVwbnjVPKTGDAgoDderd8JUdDEXrKoZ9qGLD2TPYKExt9/QDl71E+qHdWnVqWv4HKCUk2P9z/VLKzHuggOUBkCXiJUhjywUieCJhI3N92bfq2EjSBbu2/OFHqWOjLQ+QCooTEBjv8=" rvm: - - 2.6.0 + - 2.6.1 - 2.5.3 - 2.4.5 - 2.3.8 @@ -40,12 +40,15 @@ 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=v3.0.1 + - RGV=v3.0.2 matrix: include: + - rvm: 2.6.1 + script: rake rubocop + stage: linting # 3.x mode - - rvm: 2.5.3 + - rvm: 2.6.1 env: RGV=v3.0.1 BUNDLER_SPEC_SUB_VERSION=3.0.0 # Ruby 2.5, Rubygems 2.7 and up - rvm: 2.5.3 @@ -72,6 +72,13 @@ namespace :spec do # Install the gems with a consistent version of RubyGems sh "gem update --system 2.6.12" + # Fix incorrect default gem specifications on ruby 2.6.1. Can be removed + # when 2.6.2 is released and we start testing against it + if RUBY_VERSION == "2.6.1" + sh "gem install etc:1.0.1 --default" + sh "gem install bundler:1.17.2 --default" + end + $LOAD_PATH.unshift("./spec") require "support/rubygems_ext" Spec::Rubygems::DEPS["codeclimate-test-reporter"] = "~> 0.6.0" if RUBY_VERSION >= "2.2.0" @@ -133,7 +140,7 @@ begin rubyopt = ENV["RUBYOPT"] # When editing this list, also edit .travis.yml! branches = %w[master] - releases = %w[v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.29 v2.0.14 v2.1.11 v2.2.5 v2.4.8 v2.5.2 v2.6.8 v2.6.14 v2.7.7 v3.0.1] + releases = %w[v2.5.2 v2.6.14 v2.7.7 v3.0.2] (branches + releases).each do |rg| desc "Run specs with RubyGems #{rg}" RSpec::Core::RakeTask.new(rg) do |t| |