summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2013-08-15 15:03:45 -0700
committerAndre Arko <andre@arko.net>2013-08-15 15:04:51 -0700
commitb1b5b648dfe310cecf0fc324f424255290735d44 (patch)
treea5ab12840b0b325e1b883424e7995ce54b3c6482
parent4f433f559c9136e22603f2ce2f7900498b11ba72 (diff)
downloadbundler-b1b5b648dfe310cecf0fc324f424255290735d44.tar.gz
rubygems 2.0.6 and build against 2.0 stable branch
-rw-r--r--.travis.yml4
-rw-r--r--Rakefile2
2 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 501f70a267..b996bea240 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,12 +33,14 @@ 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.0.3
+ - RGV=v2.0.6
+ - RGV=2.0
matrix:
allow_failures:
# we want to know how we're doing with head, but not fail the build
- rvm: ruby-head
- env: RGV=master
+ - env: RGV=2.0
# 1.9.2 is simply too slow. it sometimes exceeds the 25m hard limit.
- rvm: 1.9.2
include:
diff --git a/Rakefile b/Rakefile
index 34e26e6022..7502e32a09 100644
--- a/Rakefile
+++ b/Rakefile
@@ -89,7 +89,7 @@ begin
namespace :rubygems do
rubyopt = ENV["RUBYOPT"]
# When editing this list, also edit .travis.yml!
- %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.25 v2.0.3).each do |rg|
+ %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.25 v2.0.6).each do |rg|
desc "Run specs with Rubygems #{rg}"
RSpec::Core::RakeTask.new(rg) do |t|
t.rspec_opts = %w(-fs --color)