Skip to content

Commit aff4a53

Browse files
authored
Merge branch 'master' into v1.0.0-saml_lib
2 parents e08b6a8 + 75b1cd9 commit aff4a53

6 files changed

Lines changed: 54 additions & 10 deletions

File tree

.github/workflows/ci.yml

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
ruby: ['2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
13+
ruby: ['2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
1414
gemfile: [rails_5.2.gemfile, rails_6.1.gemfile, rails_7.0.gemfile, rails_7.1.gemfile, rails_7.2.gemfile, rails_dev.gemfile]
1515
exclude:
1616
# Ruby 3.2 is min version for Rails 8
@@ -24,14 +24,17 @@ jobs:
2424
gemfile: rails_dev.gemfile
2525
- ruby: '3.1'
2626
gemfile: rails_dev.gemfile
27+
# Ruby 3.2 is min version for Rails 8.0
2728
- ruby: '2.5'
28-
gemfile: rails_7.0.gemfile
29-
- ruby: '2.5'
30-
gemfile: rails_7.1.gemfile
31-
- ruby: '2.6'
32-
gemfile: rails_7.0.gemfile
29+
gemfile: rails_8.0.gemfile
3330
- ruby: '2.6'
34-
gemfile: rails_7.1.gemfile
31+
gemfile: rails_8.0.gemfile
32+
- ruby: '2.7'
33+
gemfile: rails_8.0.gemfile
34+
- ruby: '3.0'
35+
gemfile: rails_8.0.gemfile
36+
- ruby: '3.1'
37+
gemfile: rails_8.0.gemfile
3538
# Ruby 3.1 is min version for Rails 7.2
3639
- ruby: '2.5'
3740
gemfile: rails_7.2.gemfile
@@ -41,6 +44,17 @@ jobs:
4144
gemfile: rails_7.2.gemfile
4245
- ruby: '3.0'
4346
gemfile: rails_7.2.gemfile
47+
# Ruby 2.7 is min version for Rails 7.1
48+
- ruby: '2.5'
49+
gemfile: rails_7.1.gemfile
50+
- ruby: '2.6'
51+
gemfile: rails_7.1.gemfile
52+
# Ruby 2.7 is min version for Rails 7.0
53+
- ruby: '2.5'
54+
gemfile: rails_7.0.gemfile
55+
- ruby: '2.6'
56+
gemfile: rails_7.0.gemfile
57+
# Ruby 2.7 is max version for Rails 5.2
4458
- ruby: '3.0'
4559
gemfile: rails_5.2.gemfile
4660
- ruby: '3.1'
@@ -49,6 +63,8 @@ jobs:
4963
gemfile: rails_5.2.gemfile
5064
- ruby: '3.3'
5165
gemfile: rails_5.2.gemfile
66+
- ruby: '3.4'
67+
gemfile: rails_5.2.gemfile
5268
runs-on: ubuntu-latest
5369
env:
5470
BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}

Appraisals

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,34 @@ end
66
appraise 'rails-6.1' do
77
gem 'rails', '~> 6.1.0'
88
gem 'activeresource', '~> 5.1.0'
9+
gem 'bigdecimal'
10+
gem 'mutex_m'
11+
gem 'concurrent-ruby', '1.3.4'
912
end
1013

1114
appraise 'rails-7.0' do
1215
gem 'rails', '~> 7.0.0'
1316
gem 'activeresource', '~> 6.0.0'
17+
gem 'bigdecimal'
18+
gem 'mutex_m'
19+
gem 'concurrent-ruby', '1.3.4'
1420
end
1521

1622
appraise 'rails-7.1' do
1723
gem 'rails', '~> 7.1.0'
1824
gem 'activeresource', '~> 6.0.0'
1925
end
2026

27+
appraise 'rails-7.2' do
28+
gem 'rails', '~> 7.2.0'
29+
gem 'activeresource', '~> 6.0.0'
30+
end
31+
32+
appraise 'rails-8.0' do
33+
gem 'rails', '~> 8.0.0'
34+
gem 'activeresource', '~> 6.0.0'
35+
end
36+
2137
appraise 'rails-dev' do
2238
gem 'rails', :github => 'rails/rails', :branch => 'main'
2339
gem 'activeresource', :github => 'rails/activeresource', :branch => 'main'

gemfiles/rails_6.1.gemfile

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

55
gem "rails", "~> 6.1.0"
66
gem "activeresource", "~> 5.1.0"
7-
gem 'concurrent-ruby', '1.3.4'
7+
gem "bigdecimal"
8+
gem "mutex_m"
9+
gem "concurrent-ruby", "1.3.4"
810

911
gemspec path: "../"

gemfiles/rails_7.0.gemfile

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

55
gem "rails", "~> 7.0.0"
66
gem "activeresource", "~> 6.0.0"
7-
gem 'concurrent-ruby', '1.3.4'
7+
gem "bigdecimal"
8+
gem "mutex_m"
9+
gem "concurrent-ruby", "1.3.4"
810

911
gemspec path: "../"

gemfiles/rails_7.2.gemfile

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

55
gem "rails", "~> 7.2.0"
6-
gem 'activeresource', '~> 6.1', '>= 6.1.3'
6+
gem "activeresource", "~> 6.0.0"
77

88
gemspec path: "../"

gemfiles/rails_8.0.gemfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "rails", "~> 8.0.0"
6+
gem "activeresource", "~> 6.0.0"
7+
8+
gemspec path: "../"

0 commit comments

Comments
 (0)