summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2013-02-27 09:41:14 -0800
committerAndre Arko <andre@arko.net>2013-03-01 23:11:44 -0800
commit1a7167131ba0d14030ed5e390ed2ae40364c8356 (patch)
treee94db8da8e6b48cb1bed2938e390f51b16b11152
parentce01bcb609accf1a16d858163514e91684276b97 (diff)
downloadbundler-1a7167131ba0d14030ed5e390ed2ae40364c8356.tar.gz
2.0 is here and we should test on it
-rw-r--r--.travis.yml12
-rw-r--r--Rakefile2
2 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index e3886ce71d..dedda1b220 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,7 @@ notifications:
rooms:
- secure: "geau3P+A9ZJHkA/OHN5v9Mcb8hAti1PllXw5DsHNJfLAWBAw5ReGGMA8Xfpf\nLdT7ktIUlQwzw94cKQ6sRZk8szXTiHncf3bxXTACJf2RpiKmbkoQU51TmCDq\nYSMuY1FIryk/3t9aZCrarufbIDI3DBscDEe4Bj9bERl+TJ8ArBY="
rvm:
+ - 2.0.0
- 1.9.3
- 1.9.2
- 1.8.7
@@ -31,24 +32,21 @@ 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=v1.8.24
+ - RGV=v2.0.0
matrix:
allow_failures:
# we want to know how we're doing with head, but not fail the build
- rvm: ruby-head
- # until the 2.0 rc, it's okay for failures to crop up
- - rvm: 2.0.0
# 1.9.2 is simply too slow. it sometimes exceeds the 25m hard limit.
- rvm: 1.9.2
include:
# riding the edge
- rvm: ruby-head
env: RGV=master
- # 2.0 release track
- - rvm: 2.0.0
- env: RGV=v2.0.0.rc.1
# Bundler 1.x supports Rubygems down to 1.5.3 on Ruby 1.9.3
- rvm: 1.9.3
+ env: RGV=v1.8.25
+ - rvm: 1.9.3
env: RGV=v1.7.2
- rvm: 1.9.3
env: RGV=v1.6.2
@@ -56,6 +54,8 @@ matrix:
env: RGV=v1.5.3
# Bundler 1.x supports Rubygems down to 1.3.6 on Ruby 1.8.7
- rvm: 1.8.7
+ env: RGV=v1.8.25
+ - rvm: 1.8.7
env: RGV=v1.7.2
- rvm: 1.8.7
env: RGV=v1.6.2
diff --git a/Rakefile b/Rakefile
index 4b06de0855..373218c9f6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -88,7 +88,7 @@ begin
namespace :rubygems do
# Rubygems specs by version
rubyopt = ENV["RUBYOPT"]
- %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.24 v2.0.0.rc.1).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.0).each do |rg|
desc "Run specs with Rubygems #{rg}"
RSpec::Core::RakeTask.new(rg) do |t|
t.rspec_opts = %w(-fs --color)