Skip to content

Commit 8c6c959

Browse files
JonRoweJonRowe
authored
Merge pull request #2001 from rspec/fix-and-reorganise
Fix and reorganise travis
2 parents 2aac389 + 506beae commit 8c6c959

File tree

2 files changed

+141
-99
lines changed

2 files changed

+141
-99
lines changed

‎.travis.yml

+137-97
Original file line numberDiff line numberDiff line change
@@ -34,129 +34,169 @@ before_script:
3434

3535
script: "script/run_build 2>&1"
3636

37-
rvm:
38-
- 1.8.7
39-
- 2.4.4
40-
- 2.3.7
41-
- 2.2
42-
- 2.1
43-
- 2.0.0
44-
- 1.9.3
45-
- 1.9.2
46-
47-
env:
48-
- RAILS_VERSION='~> 4.2.0'
49-
- RAILS_VERSION=4-2-stable
50-
- RAILS_VERSION='~> 4.1.0'
51-
- RAILS_VERSION=4-1-stable
52-
- RAILS_VERSION='~> 4.0.4'
53-
- RAILS_VERSION=4-0-stable
54-
- RAILS_VERSION='~> 3.2.17'
55-
- RAILS_VERSION=3-2-stable
56-
- RAILS_VERSION='~> 3.1.12'
57-
- RAILS_VERSION='~> 3.0.20'
58-
5937
matrix:
6038
include:
61-
# Rails 5.x only supports 2.2+
62-
- rvm: 2.2.2
63-
env: RAILS_VERSION=master
64-
- rvm: 2.2.2
65-
env: RAILS_VERSION=5-0-stable
66-
- rvm: 2.2.2
67-
env: RAILS_VERSION=5.1.0
68-
- rvm: 2.3.7
39+
# Rails dev / 6 builds >= 2.4.4
40+
- rvm: 2.5.1
6941
env: RAILS_VERSION=master
70-
- rvm: 2.3.7
71-
env: RAILS_VERSION=5-0-stable
72-
- rvm: 2.3.7
73-
env: RAILS_VERSION=5.1.0
74-
- rvm: 2.3.7
75-
env: RAILS_VERSION=5.2.0
7642
- rvm: 2.4.4
7743
env: RAILS_VERSION=master
78-
- rvm: 2.4.4
79-
env: RAILS_VERSION=5-0-stable
80-
- rvm: 2.4.4
81-
env: RAILS_VERSION=5.1.0
82-
- rvm: 2.4.4
83-
env: RAILS_VERSION=5.2.0
84-
- rvm: 2.5.1
85-
env: RAILS_VERSION=master
44+
45+
# Rails 5.2 builds >= 2.2.2
8646
- rvm: 2.5.1
87-
env: RAILS_VERSION=5-0-stable
47+
env: RAILS_VERSION='~> 5.2.0'
48+
- rvm: 2.4.4
49+
env: RAILS_VERSION='~> 5.2.0'
50+
- rvm: 2.3.7
51+
env: RAILS_VERSION='~> 5.2.0'
52+
- rvm: 2.2.10
53+
env: RAILS_VERSION='~> 5.2.0'
54+
55+
# Rails 5.1 Builds >= 2.2.2
8856
- rvm: 2.5.1
89-
env: RAILS_VERSION=5.1.0
57+
env: RAILS_VERSION='~> 5.1.0'
58+
- rvm: 2.4.4
59+
env: RAILS_VERSION='~> 5.1.0'
60+
- rvm: 2.3.7
61+
env: RAILS_VERSION='~> 5.1.0'
62+
- rvm: 2.2.10
63+
env: RAILS_VERSION='~> 5.1.0'
64+
65+
# Rails 5.0 Builds >= 2.2.2
9066
- rvm: 2.5.1
91-
env: RAILS_VERSION=5.2.0
92-
exclude:
93-
# 3.0.x is not supported on MRI 2.0+
94-
- rvm: 2.0.0
95-
env: RAILS_VERSION='~> 3.0.20'
96-
- rvm: 2.1
97-
env: RAILS_VERSION='~> 3.0.20'
98-
- rvm: 2.2
99-
env: RAILS_VERSION='~> 3.0.20'
67+
env: RAILS_VERSION='~> 5.0.0'
68+
- rvm: 2.4.4
69+
env: RAILS_VERSION='~> 5.0.0'
10070
- rvm: 2.3.7
101-
env: RAILS_VERSION='~> 3.0.20'
71+
env: RAILS_VERSION='~> 5.0.0'
72+
- rvm: 2.2.10
73+
env: RAILS_VERSION='~> 5.0.0'
74+
75+
# Rails 4.2 Builds >= 1.9.3
10276
- rvm: 2.4.4
103-
env: RAILS_VERSION='~> 3.0.20'
104-
# 4.x is not supported on MRI ruby-1.8.7 or 1.9.2
105-
- rvm: 1.8.7
106-
env: RAILS_VERSION='~> 4.0.4'
107-
- rvm: 1.9.2
108-
env: RAILS_VERSION='~> 4.0.4'
109-
- rvm: 1.8.7
110-
env: RAILS_VERSION=4-0-stable
111-
- rvm: 1.9.2
112-
env: RAILS_VERSION=4-0-stable
113-
- rvm: 1.8.7
114-
env: RAILS_VERSION='~> 4.1.0'
115-
- rvm: 1.9.2
116-
env: RAILS_VERSION='~> 4.1.0'
117-
- rvm: 1.8.7
118-
env: RAILS_VERSION=4-1-stable
119-
- rvm: 1.9.2
120-
env: RAILS_VERSION=4-1-stable
121-
- rvm: 1.8.7
12277
env: RAILS_VERSION='~> 4.2.0'
123-
- rvm: 1.9.2
78+
- rvm: 2.4.4
79+
env: RAILS_VERSION=4-2-stable
80+
- rvm: 2.3.7
12481
env: RAILS_VERSION='~> 4.2.0'
125-
- rvm: 1.8.7
82+
- rvm: 2.3.7
12683
env: RAILS_VERSION=4-2-stable
127-
- rvm: 1.9.2
84+
- rvm: 2.2.10
85+
env: RAILS_VERSION='~> 4.2.0'
86+
- rvm: 2.2.10
12887
env: RAILS_VERSION=4-2-stable
129-
# MRI 2.2+ is not supported on a few versions
130-
- rvm: 2.2
131-
env: RAILS_VERSION='~> 3.1.12'
88+
- rvm: 2.1.10
89+
env: RAILS_VERSION='~> 4.2.0'
90+
- rvm: 2.1.10
91+
env: RAILS_VERSION=4-2-stable
92+
- rvm: 2.0.0
93+
env: RAILS_VERSION='~> 4.2.0'
94+
- rvm: 2.0.0
95+
env: RAILS_VERSION=4-2-stable
96+
- rvm: 1.9.3
97+
env: RAILS_VERSION='~> 4.2.0'
98+
- rvm: 1.9.3
99+
env: RAILS_VERSION=4-2-stable
100+
101+
# Rails 4.1 Builds >= 1.9.3, < 2.4
132102
- rvm: 2.3.7
133-
env: RAILS_VERSION='~> 3.1.12'
134-
# MRI 2.4+ is not supported on a few versions
135-
- rvm: 2.4.4
136103
env: RAILS_VERSION='~> 4.1.0'
137-
- rvm: 2.4.4
104+
- rvm: 2.3.7
138105
env: RAILS_VERSION=4-1-stable
139-
- rvm: 2.4.4
106+
- rvm: 2.2.10
107+
env: RAILS_VERSION='~> 4.1.0'
108+
- rvm: 2.2.10
109+
env: RAILS_VERSION=4-1-stable
110+
- rvm: 2.1.10
111+
env: RAILS_VERSION='~> 4.1.0'
112+
- rvm: 2.1.10
113+
env: RAILS_VERSION=4-1-stable
114+
- rvm: 2.0.0
115+
env: RAILS_VERSION='~> 4.1.0'
116+
- rvm: 2.0.0
117+
env: RAILS_VERSION=4-1-stable
118+
- rvm: 1.9.3
119+
env: RAILS_VERSION='~> 4.1.0'
120+
- rvm: 1.9.3
121+
env: RAILS_VERSION=4-1-stable
122+
123+
# Rails 4.0 Builds >= 1.8.11, < 2.4
124+
- rvm: 2.3.7
140125
env: RAILS_VERSION='~> 4.0.4'
141-
- rvm: 2.4.4
126+
- rvm: 2.3.7
142127
env: RAILS_VERSION=4-0-stable
143-
- rvm: 2.4.4
128+
- rvm: 2.2.10
129+
env: RAILS_VERSION='~> 4.0.4'
130+
- rvm: 2.2.10
131+
env: RAILS_VERSION=4-0-stable
132+
- rvm: 2.1.10
133+
env: RAILS_VERSION='~> 4.0.4'
134+
- rvm: 2.1.10
135+
env: RAILS_VERSION=4-0-stable
136+
- rvm: 2.0.0
137+
env: RAILS_VERSION='~> 4.0.4'
138+
- rvm: 2.0.0
139+
env: RAILS_VERSION=4-0-stable
140+
- rvm: 1.9.3
141+
env: RAILS_VERSION='~> 4.0.4'
142+
- rvm: 1.9.3
143+
env: RAILS_VERSION=4-0-stable
144+
145+
# Rails 3.2 Builds < 2.4
146+
- rvm: 2.3.7
144147
env: RAILS_VERSION='~> 3.2.17'
145-
- rvm: 2.4.4
148+
- rvm: 2.3.7
146149
env: RAILS_VERSION=3-2-stable
147-
- rvm: 2.4.4
150+
- rvm: 2.2.10
151+
env: RAILS_VERSION='~> 3.2.17'
152+
- rvm: 2.2.10
153+
env: RAILS_VERSION=3-2-stable
154+
- rvm: 2.1.10
155+
env: RAILS_VERSION='~> 3.2.17'
156+
- rvm: 2.1.10
157+
env: RAILS_VERSION=3-2-stable
158+
- rvm: 2.0.0
159+
env: RAILS_VERSION='~> 3.2.17'
160+
- rvm: 2.0.0
161+
env: RAILS_VERSION=3-2-stable
162+
- rvm: 1.9.3
163+
env: RAILS_VERSION='~> 3.2.17'
164+
- rvm: 1.9.3
165+
env: RAILS_VERSION=3-2-stable
166+
- rvm: 1.9.2
167+
env: RAILS_VERSION='~> 3.2.17'
168+
- rvm: 1.9.2
169+
env: RAILS_VERSION=3-2-stable
170+
- rvm: 1.8.7
171+
env: RAILS_VERSION='~> 3.2.17'
172+
- rvm: 1.8.7
173+
env: RAILS_VERSION=3-2-stable
174+
175+
# Rails 3.1 Builds, < 2.2
176+
- rvm: 2.1.10
148177
env: RAILS_VERSION='~> 3.1.12'
149-
- rvm: 2.4.4
150-
env: RAILS_VERSION=5.2.0.rc1
178+
- rvm: 2.0.0
179+
env: RAILS_VERSION='~> 3.1.12'
180+
- rvm: 1.9.3
181+
env: RAILS_VERSION='~> 3.1.12'
182+
- rvm: 1.9.2
183+
env: RAILS_VERSION='~> 3.1.12'
184+
- rvm: 1.8.7
185+
env: RAILS_VERSION='~> 3.1.12'
186+
187+
# Rails 3.0 Builds, < 2
188+
- rvm: 1.9.3
189+
env: RAILS_VERSION='~> 3.0.20'
190+
- rvm: 1.9.2
191+
env: RAILS_VERSION='~> 3.0.20'
192+
- rvm: 1.8.7
193+
env: RAILS_VERSION='~> 3.0.20'
194+
151195
allow_failures:
152-
- rvm: 2.2.2
153-
env: RAILS_VERSION=master
154-
- rvm: 2.3.7
196+
- rvm: 2.5.1
155197
env: RAILS_VERSION=master
156198
- rvm: 2.4.4
157199
env: RAILS_VERSION=master
158-
- rvm: 2.5.1
159-
env: RAILS_VERSION=master
160200
fast_finish: true
161201

162202
branches:

‎example_app_generator/generate_app.rb

+4-2
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,12 @@
4141
|# Rack::Cache 1.3.0 requires Ruby >= 2.0.0
4242
|gem 'rack-cache', '< 1.3.0' if RUBY_VERSION < '2.0.0'
4343
|
44-
|if RUBY_VERSION >= '1.9.3'
44+
|if RUBY_VERSION >= '2.0.0'
4545
| gem 'rake', '>= 10.0.0'
46+
|elsif RUBY_VERSION >= '1.9.3'
47+
| gem 'rake', '< 12.0.0' # rake 12 requires Ruby 2.0.0 or later
4648
|else
47-
| gem 'rake', '~> 10.0' # rake 11 requires Ruby 1.9.3 or later
49+
| gem 'rake', '< 11.0.0' # rake 11 requires Ruby 1.9.3 or later
4850
|end
4951
|
5052
|# Version 3 of mime-types 3 requires Ruby 2.0

0 commit comments

Comments
 (0)