Skip to content

Commit 2615bf9

Browse files
rafaelfrancarafaelfranca
authored
Merge pull request #303 from rails/rm-ci
Fix CI
2 parents e4860c0 + a67d73a commit 2615bf9

21 files changed

+160
-1571
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,37 @@ jobs:
66
fail-fast: false
77
matrix:
88
ruby-version:
9+
- "3.1"
910
- "3.2"
1011
- "3.3"
11-
gemfile:
12-
- Gemfile
13-
- gemfiles/rails_7_0_propshaft.gemfile
14-
- gemfiles/rails_7_1_propshaft.gemfile
15-
- gemfiles/rails_7_2_propshaft.gemfile
16-
- gemfiles/rails_main_propshaft.gemfile
17-
- gemfiles/rails_7_0_sprockets.gemfile
18-
- gemfiles/rails_7_1_sprockets.gemfile
19-
- gemfiles/rails_7_2_sprockets.gemfile
20-
- gemfiles/rails_main_sprockets.gemfile
21-
include:
12+
- "3.4"
13+
rails-version:
14+
- "6.1"
15+
- "7.0"
16+
- "7.1"
17+
- "7.2"
18+
- "8.0"
19+
- "main"
20+
assets-pipeline:
21+
- sprockets
22+
- propshaft
23+
exclude:
24+
- rails-version: "6.1"
25+
assets-pipeline: "propshaft"
2226
- ruby-version: "3.1"
23-
gemfile: gemfiles/rails_7_0_propshaft.gemfile
27+
rails-version: "8.0"
2428
- ruby-version: "3.1"
25-
gemfile: gemfiles/rails_7_1_propshaft.gemfile
26-
- ruby-version: "3.1"
27-
gemfile: gemfiles/rails_7_0_sprockets.gemfile
28-
- ruby-version: "3.1"
29-
gemfile: gemfiles/rails_7_1_sprockets.gemfile
29+
rails-version: "main"
30+
- rails-version: "8.0"
31+
assets-pipeline: "sprockets"
32+
- rails-version: "main"
33+
assets-pipeline: "sprockets"
3034

31-
name: ${{ format('Tests (Ruby {0}, {1})', matrix.ruby-version, matrix.gemfile) }}
35+
name: ${{ format('Tests (Ruby {0}, Rails {1}, {2})', matrix.ruby-version, matrix.rails-version, matrix.assets-pipeline) }}
3236
runs-on: ubuntu-latest
3337

3438
env:
35-
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
39+
BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails-version }}_${{ matrix.assets-pipeline }}.gemfile
3640

3741
steps:
3842
- uses: actions/checkout@v4

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
*.gem
2323

2424
# Ignore Gemfile.lock files for Rails main branch.
25-
/gemfiles/rails_main*.gemfile.lock
25+
/gemfiles/*.lock

‎Appraisals‎

Lines changed: 43 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,62 @@
1-
appraise "rails_7_0_sprockets" do
2-
gem "rails", "~> 7.0.0"
1+
appraise "rails_6.1_sprockets" do
2+
gem "rails", "~> 6.1.0"
3+
remove_gem "propshaft"
4+
gem "logger"
5+
gem "sqlite3", "~> 1.4"
6+
gem "bigdecimal"
7+
gem "mutex_m"
8+
gem "drb"
9+
end
10+
11+
appraise "rails_7.0_sprockets" do
12+
gem "rails", github: "rails/rails", branch: "7-0-stable"
13+
remove_gem "propshaft"
314
gem "sprockets-rails"
15+
gem "sqlite3", "~> 1.4"
416
end
517

6-
appraise "rails_7_0_propshaft" do
7-
gem "rails", "~> 7.0.0"
18+
appraise "rails_7.0_propshaft" do
19+
gem "rails", github: "rails/rails", branch: "7-0-stable"
820
gem "propshaft"
21+
gem "sqlite3", "~> 1.4"
922
end
1023

11-
appraise "rails_7_1_sprockets" do
24+
appraise "rails_7.1_sprockets" do
1225
gem "rails", "~> 7.1.0"
26+
remove_gem "propshaft"
1327
gem "sprockets-rails"
1428
end
1529

16-
appraise "rails_7_1_propshaft" do
30+
appraise "rails_7.1_propshaft" do
1731
gem "rails", "~> 7.1.0"
1832
gem "propshaft"
1933
end
2034

35+
appraise "rails_7.2_sprockets" do
36+
gem "rails", "~> 7.2.0"
37+
remove_gem "propshaft"
38+
gem "sprockets-rails"
39+
end
40+
41+
appraise "rails_7.2_propshaft" do
42+
gem "rails", "~> 7.2.0"
43+
gem "propshaft"
44+
end
45+
46+
appraise "rails_8.0_sprockets" do
47+
gem "rails", "~> 8.0.0"
48+
remove_gem "propshaft"
49+
gem "sprockets-rails"
50+
end
51+
52+
appraise "rails_8.0_propshaft" do
53+
gem "rails", "~> 8.0.0"
54+
gem "propshaft"
55+
end
56+
2157
appraise "rails_main_sprockets" do
2258
gem "rails", github: "rails/rails", branch: "main"
59+
remove_gem "propshaft"
2360
gem "sprockets-rails"
2461
end
2562

‎gemfiles/rails_6.1_sprockets.gemfile‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rails", "~> 6.1.0"
6+
gem "sqlite3", "~> 1.4"
7+
gem "logger"
8+
gem "bigdecimal"
9+
gem "mutex_m"
10+
gem "drb"
11+
12+
group :development do
13+
gem "appraisal"
14+
end
15+
16+
group :test do
17+
gem "turbo-rails"
18+
gem "stimulus-rails"
19+
gem "byebug"
20+
gem "rexml"
21+
gem "capybara"
22+
gem "selenium-webdriver"
23+
gem "webdrivers"
24+
end
25+
26+
gemspec path: "../"

‎gemfiles/rails_7.0_propshaft.gemfile‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rails", branch: "7-0-stable", git: "https://github.com/rails/rails.git"
6+
gem "propshaft"
7+
gem "sqlite3", "~> 1.4"
8+
9+
group :development do
10+
gem "appraisal"
11+
end
12+
13+
group :test do
14+
gem "turbo-rails"
15+
gem "stimulus-rails"
16+
gem "byebug"
17+
gem "rexml"
18+
gem "capybara"
19+
gem "selenium-webdriver"
20+
gem "webdrivers"
21+
end
22+
23+
gemspec path: "../"

‎gemfiles/rails_7.0_sprockets.gemfile‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rails", branch: "7-0-stable", git: "https://github.com/rails/rails.git"
6+
gem "sqlite3", "~> 1.4"
7+
gem "sprockets-rails"
8+
9+
group :development do
10+
gem "appraisal"
11+
end
12+
13+
group :test do
14+
gem "turbo-rails"
15+
gem "stimulus-rails"
16+
gem "byebug"
17+
gem "rexml"
18+
gem "capybara"
19+
gem "selenium-webdriver"
20+
gem "webdrivers"
21+
end
22+
23+
gemspec path: "../"

‎gemfiles/rails_7_1_propshaft.gemfile‎ renamed to ‎gemfiles/rails_7.1_propshaft.gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
source "https://rubygems.org"
44

55
gem "rails", "~> 7.1.0"
6-
gem "sqlite3", "~> 1.4"
76
gem "propshaft"
7+
gem "sqlite3"
88

99
group :development do
1010
gem "appraisal"

‎gemfiles/rails_7_1_sprockets.gemfile‎ renamed to ‎gemfiles/rails_7.1_sprockets.gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "rails", "~> 7.1.0"
6-
gem "sqlite3", "~> 1.4"
6+
gem "sqlite3"
77
gem "sprockets-rails"
88

99
group :development do

‎gemfiles/rails_7_2_propshaft.gemfile‎ renamed to ‎gemfiles/rails_7.2_propshaft.gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
source "https://rubygems.org"
44

55
gem "rails", "~> 7.2.0"
6-
gem "sqlite3", "~> 1.4"
76
gem "propshaft"
7+
gem "sqlite3"
88

99
group :development do
1010
gem "appraisal"

‎gemfiles/rails_7_2_sprockets.gemfile‎ renamed to ‎gemfiles/rails_7.2_sprockets.gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "rails", "~> 7.2.0"
6-
gem "sqlite3", "~> 1.4"
6+
gem "sqlite3"
77
gem "sprockets-rails"
88

99
group :development do

0 commit comments

Comments
 (0)