summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHomu <homu@barosl.com>2016-02-26 14:37:36 +0900
committerHomu <homu@barosl.com>2016-02-26 14:37:36 +0900
commited6fd41fe65f33eb7a551836e89b0ea23bfe58bf (patch)
treebe6e3755af43ff52d7097277c3475db0e08a05a4
parent4552992885035a4a22f49fc0dc7f55681463a194 (diff)
parentd20f4fe9d63b024c10d5a6882dcedace9b2d71a9 (diff)
downloadbundler-ed6fd41fe65f33eb7a551836e89b0ea23bfe58bf.tar.gz
Auto merge of #4322 - bundler:seg-rubygems-2.6.0, r=indirect
[Travis] Test against RubyGems 2.6.0 \c @indirect
-rw-r--r--.travis.yml2
-rw-r--r--Rakefile4
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index a707d9ee7c..0b6e02744f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ 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.5.2
+ - RGV=v2.6.0
- RGV=v2.4.8
matrix:
diff --git a/Rakefile b/Rakefile
index e22e3f693b..f63081001b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -65,7 +65,7 @@ namespace :spec do
sh "sudo apt-get install graphviz -y 2>&1 | tail -n 2"
# Install the gems with a consistent version of RubyGems
- sh "gem update --system 2.5.2"
+ sh "gem update --system 2.6.0"
$LOAD_PATH.unshift("./spec")
require "support/rubygems_ext"
@@ -122,7 +122,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)
+ 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.6.0)
(branches + releases).each do |rg|
desc "Run specs with Rubygems #{rg}"
RSpec::Core::RakeTask.new(rg) do |t|