Skip to content

Commit da4e4d4

Browse files
committed
Merge pull request #214 from rails/fix-2.x-tests
Fix 2.x branch CI
2 parents 5fbf78d + 47701d3 commit da4e4d4

File tree

5 files changed

+24
-26
lines changed

5 files changed

+24
-26
lines changed

.travis.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
language: ruby
2+
cache: bundler
3+
sudo: false
4+
15
rvm:
26
- 1.8.7
37
- 1.9.3
@@ -7,8 +11,6 @@ rvm:
711
gemfile:
812
- Gemfile
913
- test/gemfiles/Gemfile.rails-3.0.x
10-
- test/gemfiles/Gemfile.rails-3.1.x
11-
- test/gemfiles/Gemfile.rails-3.2.x
1214
- test/gemfiles/Gemfile.rails-4.0.x
1315
- test/gemfiles/Gemfile.rails-4.1.x
1416
- test/gemfiles/Gemfile.sprockets-2.11.x
@@ -28,6 +30,10 @@ matrix:
2830
rvm: 1.8.7
2931
- gemfile: test/gemfiles/Gemfile.rails-4.1.x
3032
rvm: 1.8.7
33+
- gemfile: test/gemfiles/Gemfile.rails-4.2.x
34+
rvm: 1.8.7
35+
- gemfile: test/gemfiles/Gemfile.rails-5.0.x
36+
rvm: 1.8.7
3137
- gemfile: test/gemfiles/Gemfile.sprockets-2.11.x
3238
rvm: 1.8.7
3339
- gemfile: test/gemfiles/Gemfile.sprockets-2.12.x
@@ -38,10 +44,16 @@ matrix:
3844
rvm: 1.8.7
3945
- gemfile: Gemfile
4046
env: LEGACY=true
47+
- gemfile: test/gemfiles/Gemfile.rails-3.0.x
48+
env: LEGACY=false
4149
- gemfile: test/gemfiles/Gemfile.rails-4.0.x
4250
env: LEGACY=true
4351
- gemfile: test/gemfiles/Gemfile.rails-4.1.x
4452
env: LEGACY=true
53+
- gemfile: test/gemfiles/Gemfile.rails-4.2.x
54+
env: LEGACY=true
55+
- gemfile: test/gemfiles/Gemfile.rails-5.0.x
56+
env: LEGACY=true
4557
- gemfile: test/gemfiles/Gemfile.sprockets-2.11.x
4658
env: LEGACY=true
4759
- gemfile: test/gemfiles/Gemfile.sprockets-2.12.x
@@ -50,12 +62,6 @@ matrix:
5062
env: LEGACY=true
5163
- gemfile: test/gemfiles/Gemfile.sprockets-3.0.x
5264
env: LEGACY=true
53-
- gemfile: test/gemfiles/Gemfile.rails-3.0.x
54-
env: LEGACY=false
55-
- gemfile: test/gemfiles/Gemfile.rails-3.1.x
56-
env: LEGACY=false
57-
- gemfile: test/gemfiles/Gemfile.rails-3.2.x
58-
env: LEGACY=false
5965

6066
script: ./script/test
6167

test/gemfiles/Gemfile.rails-3.1.x

Lines changed: 0 additions & 9 deletions
This file was deleted.

test/gemfiles/Gemfile.rails-3.2.x

Lines changed: 0 additions & 9 deletions
This file was deleted.

test/gemfiles/Gemfile.rails-4.2.x

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
source 'https://rubygems.org'
2+
gemspec :path => "./../.."
3+
4+
gem "actionpack", "~> 4.2.0"
5+
gem "railties", "~> 4.2.0"

test/gemfiles/Gemfile.rails-5.0.x

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
source 'https://rubygems.org'
2+
gemspec :path => "./../.."
3+
4+
gem "actionpack", :github => "rails/rails", :branch => "master"
5+
gem "railties", :github => "rails/rails", :branch => "master"

0 commit comments

Comments
 (0)