Skip to content

Commit dece4f8

Browse files
taketo1113taketo1113
authored
Merge pull request #868 from javan/ci-with-activesupport
CI: Add tests using ActiveSupport to CI
2 parents 9c52d58 + 499d2c4 commit dece4f8

16 files changed

+218
-29
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ jobs:
77
test:
88
runs-on: ${{ matrix.os }}
99
strategy:
10+
fail-fast: false
1011
matrix:
1112
os: [ubuntu-latest, macos-latest]
1213
ruby-version: [ '2.4', '2.5', '2.6', '2.7', '3.0', '3.0', '3.2', '3.3', '3.4', 'jruby-9', 'jruby-10']
@@ -34,3 +35,50 @@ jobs:
3435
run: bundle exec rake test
3536
env:
3637
JRUBY_OPTS: "--debug"
38+
39+
# Test with activesupport
40+
test-activesupport:
41+
runs-on: ubuntu-latest
42+
strategy:
43+
fail-fast: false
44+
matrix:
45+
ruby-version: ['2.7', '3.0', '3.0', '3.2', '3.3', '3.4']
46+
rails-version: ['6.0', '6.1', '7.0', '7.1', '7.2', '8.0', '8.1']
47+
include:
48+
- ruby-version: 2.7
49+
rails-version: '5.0'
50+
- ruby-version: 2.7
51+
rails-version: '5.1'
52+
- ruby-version: 2.7
53+
rails-version: '5.2'
54+
exclude:
55+
# rails 8.1: support ruby 3.2+
56+
- ruby-version: 2.7
57+
rails-version: '8.1'
58+
- ruby-version: 3.0
59+
rails-version: '8.1'
60+
- ruby-version: 3.1
61+
rails-version: '8.1'
62+
# rails 8.0: support ruby 3.2+
63+
- ruby-version: 2.7
64+
rails-version: '8.0'
65+
- ruby-version: 3.0
66+
rails-version: '8.0'
67+
- ruby-version: 3.1
68+
rails-version: '8.0'
69+
# rails 7.2: support ruby 3.1+
70+
- ruby-version: 2.7
71+
rails-version: '7.2'
72+
- ruby-version: 3.0
73+
rails-version: '7.2'
74+
env:
75+
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/activesupport${{ matrix.rails-version }}.gemfile
76+
steps:
77+
- uses: actions/checkout@v5
78+
name: Set up Ruby ${{ matrix.ruby-version }}
79+
- uses: ruby/setup-ruby@v1
80+
with:
81+
ruby-version: ${{ matrix.ruby-version }}
82+
bundler-cache: true
83+
- name: Run tests
84+
run: bundle exec rake test

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/doc/
66
/pkg/
77
/spec/reports/
8-
/tmp/
8+
tmp/
99

1010
/Gemfile.lock
1111
gemfiles/*.lock

‎Appraisals‎

Lines changed: 60 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,69 @@
1-
appraise 'activesupport4.1' do
2-
gem "activesupport", "~> 4.1.0"
1+
if RUBY_VERSION < "3.0"
2+
appraise 'activesupport5.0' do
3+
gem "activesupport", "~> 5.0.0"
4+
end
5+
6+
appraise 'activesupport5.1' do
7+
gem "activesupport", "~> 5.1.0"
8+
end
9+
10+
appraise 'activesupport5.2' do
11+
gem "activesupport", "~> 5.2.0"
12+
end
13+
end
14+
15+
appraise 'activesupport6.0' do
16+
gem "activesupport", "~> 6.0.0"
17+
18+
# ruby 3.3+
19+
gem "base64"
20+
gem "bigdecimal"
21+
gem "mutex_m"
22+
# ruby 3.4+
23+
gem "benchmark"
24+
gem "logger"
25+
26+
# Fix https://github.com/rails/rails/issues/54260
27+
gem 'concurrent-ruby', "1.3.4"
328
end
429

5-
appraise 'activesupport4.2' do
6-
gem "activesupport", "~> 4.2.0"
30+
appraise 'activesupport6.1' do
31+
gem "activesupport", "~> 6.1.0"
32+
33+
# ruby 3.3+
34+
gem "base64"
35+
gem "bigdecimal"
36+
gem "mutex_m"
37+
# ruby 3.4+
38+
gem "benchmark"
39+
gem "logger"
40+
41+
# Fix https://github.com/rails/rails/issues/54260
42+
gem 'concurrent-ruby', "1.3.4"
743
end
844

9-
appraise 'activesupport5.0' do
10-
gem "activesupport", "~> 5.0.0"
45+
if RUBY_VERSION >= "2.7"
46+
appraise 'activesupport7.0' do
47+
gem "activesupport", "~> 7.0.0"
48+
end
1149
end
1250

13-
appraise 'activesupport5.1' do
14-
gem "activesupport", "~> 5.1.0"
51+
if RUBY_VERSION >= "3.1"
52+
appraise 'activesupport7.1' do
53+
gem "activesupport", "~> 7.1.0"
54+
end
1555
end
1656

17-
appraise 'activesupport5.2' do
18-
gem "activesupport", "~> 5.2.0beta2"
57+
if RUBY_VERSION >= "3.2"
58+
appraise 'activesupport7.2' do
59+
gem "activesupport", "~> 7.2.0"
60+
end
61+
62+
appraise 'activesupport8.0' do
63+
gem "activesupport", "~> 8.0.0"
64+
end
65+
66+
appraise 'activesupport8.1' do
67+
gem "activesupport", "~> 8.1.0"
68+
end
1969
end

‎gemfiles/activesupport4.1.gemfile‎

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

‎gemfiles/activesupport4.2.gemfile‎

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

‎gemfiles/activesupport5.0.gemfile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
# This file was generated by Appraisal
22

3-
source "http://rubygems.org"
3+
source "https://rubygems.org"
44

5+
gem "rake"
6+
gem "mocha"
7+
gem "minitest"
8+
gem "appraisal"
59
gem "activesupport", "~> 5.0.0"
610

711
gemspec path: "../"

‎gemfiles/activesupport5.1.gemfile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
# This file was generated by Appraisal
22

3-
source "http://rubygems.org"
3+
source "https://rubygems.org"
44

5+
gem "rake"
6+
gem "mocha"
7+
gem "minitest"
8+
gem "appraisal"
59
gem "activesupport", "~> 5.1.0"
610

711
gemspec path: "../"

‎gemfiles/activesupport5.2.gemfile‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
# This file was generated by Appraisal
22

3-
source "http://rubygems.org"
3+
source "https://rubygems.org"
44

5-
gem "activesupport", "~> 5.2.0beta2"
5+
gem "rake"
6+
gem "mocha"
7+
gem "minitest"
8+
gem "appraisal"
9+
gem "activesupport", "~> 5.2.0"
610

711
gemspec path: "../"

‎gemfiles/activesupport6.0.gemfile‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rake"
6+
gem "mocha"
7+
gem "minitest"
8+
gem "appraisal"
9+
gem "activesupport", "~> 6.0.0"
10+
gem "base64"
11+
gem "bigdecimal"
12+
gem "mutex_m"
13+
gem "benchmark"
14+
gem "logger"
15+
gem "concurrent-ruby", "1.3.4"
16+
17+
gemspec path: "../"

‎gemfiles/activesupport6.1.gemfile‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rake"
6+
gem "mocha"
7+
gem "minitest"
8+
gem "appraisal"
9+
gem "activesupport", "~> 6.1.0"
10+
gem "base64"
11+
gem "bigdecimal"
12+
gem "mutex_m"
13+
gem "benchmark"
14+
gem "logger"
15+
gem "concurrent-ruby", "1.3.4"
16+
17+
gemspec path: "../"

0 commit comments

Comments
 (0)