summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBundlerbot <bot@bundler.io>2019-02-10 18:27:40 +0000
committerBundlerbot <bot@bundler.io>2019-02-10 18:27:40 +0000
commit0ca2f4ea781abf697c484df6ba26feeded744854 (patch)
treed8f9b20e610baefa7bc26f54b1d05b4b8300e0a8
parent1a63384c807f164bfc2fe26ce34ac781a974c7e6 (diff)
parent48ed6449b7cbf45cede010fce19e71f9a1d73e41 (diff)
downloadbundler-0ca2f4ea781abf697c484df6ba26feeded744854.tar.gz
Merge #6948
6948: Bump rubygems to 3.0.2 and ruby to 2.6.1 in TravisCI r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that I have some spec failures locally, and they don't seem to be reproduced in TravisCI. ### What was your diagnosis of the problem? My diagnosis was that either my environment is messed up or there's some issues with the latest rubygems + ruby combination. ### What is your fix for the problem, implemented in this PR? My fix is to use latest rubygems and ruby in Travis, so I can double check whether the problem is just my environment or a real problem. ### Why did you choose this fix out of the possible options? I chose this fix because it's always good practice to test against the latest versions of your dependencies. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
-rw-r--r--.travis.yml8
-rw-r--r--Rakefile9
2 files changed, 12 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 99d0cbb386..0fc2456d94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,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
@@ -43,11 +43,11 @@ 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
jobs:
include:
- - rvm: 2.6.0
+ - rvm: 2.6.1
script: rake rubocop
stage: linting
# Ruby 2.5, Rubygems 2.7 and up
@@ -76,7 +76,7 @@ jobs:
env: RGV=master
stage: test
# 1.x mode (we want to keep stuff passing in 1.x mode for now)
- - rvm: 2.6.0
+ - rvm: 2.6.1
env: RGV=v2.7.7 BUNDLER_SPEC_SUB_VERSION=1.98
stage: test
diff --git a/Rakefile b/Rakefile
index 21b11b9e59..3f1606405e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -75,6 +75,13 @@ namespace :spec do
# Install the gems with a consistent version of RubyGems
sh "gem update --system 2.6.13"
+ # 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"
@@ -136,7 +143,7 @@ begin
rubyopt = ENV["RUBYOPT"]
# When editing this list, also edit .travis.yml!
branches = %w[master]
- releases = %w[v2.5.2 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|