Skip to content

Commit 23ac7f7

Browse files
committed
Test against Rails releases, not stable branches
1 parent 35f5035 commit 23ac7f7

10 files changed

+59
-57
lines changed

.travis.yml

+33-40
Original file line numberDiff line numberDiff line change
@@ -3,69 +3,62 @@ language: ruby
33
cache: bundler
44

55
rvm:
6-
- 2.0
7-
- 2.1
8-
- 2.2.5
9-
- 2.3.1
10-
- 2.4.0
11-
- ruby-head
12-
- jruby
13-
- jruby-head
14-
15-
env:
16-
global:
17-
- JRUBY_OPTS="--2.0"
6+
- 2.2.7
7+
- 2.3.4
8+
- 2.4.1
9+
- jruby-9.1.5.0
1810

1911
gemfile:
20-
- Gemfile
21-
- gemfiles/rails-4-0-stable.gemfile
22-
- gemfiles/rails-4-1-stable.gemfile
23-
- gemfiles/rails-4-2-stable.gemfile
24-
- gemfiles/rails-5-0-stable.gemfile
12+
- gemfiles/rails-4-0.gemfile
13+
- gemfiles/rails-4-1.gemfile
14+
- gemfiles/rails-4-2.gemfile
15+
- gemfiles/rails-5-0.gemfile
16+
- gemfiles/rails-5-1.gemfile
2517
- gemfiles/rails-master.gemfile
2618

2719
sudo: false
2820

21+
before_install:
22+
- gem update bundler
23+
2924
before_script:
3025
- psql -c 'create database carrierwave_test;' -U postgres
3126

3227
matrix:
33-
exclude:
28+
include:
3429
- rvm: 2.0
35-
gemfile: Gemfile
30+
gemfile: gemfiles/rails-4-0.gemfile
3631
- rvm: 2.0
37-
gemfile: gemfiles/rails-master.gemfile
32+
gemfile: gemfiles/rails-4-1.gemfile
33+
- rvm: 2.0
34+
gemfile: gemfiles/rails-4-2.gemfile
3835
- rvm: 2.1
39-
gemfile: Gemfile
36+
gemfile: gemfiles/rails-4-0.gemfile
4037
- rvm: 2.1
41-
gemfile: gemfiles/rails-master.gemfile
42-
- rvm: 2.0
43-
gemfile: gemfiles/rails-5-0-stable.gemfile
38+
gemfile: gemfiles/rails-4-1.gemfile
4439
- rvm: 2.1
45-
gemfile: gemfiles/rails-5-0-stable.gemfile
46-
- rvm: 2.4.0
47-
gemfile: gemfiles/rails-4-0-stable.gemfile
48-
- rvm: 2.4.0
49-
gemfile: gemfiles/rails-4-1-stable.gemfile
50-
- rvm: 2.4.0
51-
gemfile: gemfiles/rails-4-2-stable.gemfile
52-
- rvm: ruby-head
53-
gemfile: gemfiles/rails-4-0-stable.gemfile
40+
gemfile: gemfiles/rails-4-2.gemfile
5441
- rvm: ruby-head
55-
gemfile: gemfiles/rails-4-1-stable.gemfile
42+
gemfile: gemfiles/rails-5-1.gemfile
5643
- rvm: ruby-head
57-
gemfile: gemfiles/rails-4-2-stable.gemfile
58-
- rvm: jruby
59-
gemfile: Gemfile
60-
- rvm: jruby
6144
gemfile: gemfiles/rails-master.gemfile
62-
- rvm: jruby
63-
gemfile: gemfiles/rails-5-0-stable.gemfile
45+
- rvm: jruby-head
46+
gemfile: gemfiles/rails-5-1.gemfile
6447
- rvm: jruby-head
6548
gemfile: gemfiles/rails-master.gemfile
49+
exclude:
50+
- rvm: 2.4.1
51+
gemfile: gemfiles/rails-4-0.gemfile
52+
- rvm: 2.4.1
53+
gemfile: gemfiles/rails-4-1.gemfile
54+
- rvm: 2.4.1
55+
gemfile: gemfiles/rails-4-2.gemfile
6656
allow_failures:
6757
- rvm: ruby-head
6858
- rvm: jruby-head
59+
- gemfile: gemfiles/rails-master.gemfile
60+
- rvm: jruby-9.1.5.0
61+
gemfile: gemfiles/rails-5-1.gemfile
6962
fast_finish: true
7063

7164
notifications:
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source "https://rubygems.org"
22

3-
gem "rails", :github => "rails/rails", :branch => "4-0-stable"
3+
gem "rails", "~> 4.0.0"
44
gem "railties", "~> 4.0.0"
55

66
gemspec :path => "../"

gemfiles/rails-4-1-stable.gemfile

-5
This file was deleted.

gemfiles/rails-4-1.gemfile

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
source "https://rubygems.org"
2+
3+
gem "rails", "~> 4.1.0"
4+
5+
gemspec :path => "../"

gemfiles/rails-4-2-stable.gemfile

-5
This file was deleted.

gemfiles/rails-4-2.gemfile

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
source "https://rubygems.org"
2+
3+
gem "rails", "~> 4.2.0"
4+
5+
gemspec :path => "../"

gemfiles/rails-5-0-stable.gemfile

-6
This file was deleted.

gemfiles/rails-5-0.gemfile

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
source "https://rubygems.org"
2+
3+
gem "rails", "~> 5.0.0"
4+
gem "activemodel-serializers-xml"
5+
gem "activerecord-jdbcpostgresql-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "rails-5", platforms: :jruby
6+
7+
gemspec :path => "../"

gemfiles/rails-5-1.gemfile

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
source "https://rubygems.org"
2+
3+
gem "rails", "~> 5.1.0"
4+
gem "activemodel-serializers-xml"
5+
gem "activerecord-jdbcpostgresql-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "rails-5", platforms: :jruby
6+
7+
gemspec :path => "../"

gemfiles/rails-master.gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ gem "sprockets", github: "rails/sprockets", branch: "master"
77
gem "sprockets-rails", github: "rails/sprockets-rails", branch: "master"
88
gem "sass-rails", github: "rails/sass-rails"
99
gem "activemodel-serializers-xml"
10+
gem "activerecord-jdbcpostgresql-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "rails-5", platforms: :jruby
1011

1112
gemspec :path => "../"

0 commit comments

Comments
 (0)