Skip to content

Commit a364fb2

Browse files
authored
Merge pull request #58 from zendesk/jury.razumau/test_versions_rails_main
add tests with Rails main and 7.2, drop support for Ruby below 3.1
2 parents e968947 + 866f997 commit a364fb2

File tree

8 files changed

+94
-4
lines changed

8 files changed

+94
-4
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,17 @@ jobs:
99
fail-fast: false
1010
matrix:
1111
ruby:
12-
- '2.7'
13-
- '3.0'
1412
- '3.1'
1513
- '3.2'
1614
- '3.3'
17-
- jruby
15+
- 'jruby-9.4'
1816
gemfile:
1917
- rails7.0
2018
- rails7.1
19+
- rails7.2
20+
exclude:
21+
- { ruby: 'jruby-9.4', gemfile: 'rails_main' }
22+
- { ruby: '3.1', gemfile: 'rails_main' }
2123
env:
2224
BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
2325
steps:
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Test against Rails main
2+
3+
on:
4+
schedule:
5+
- cron: "0 0 * * *" # Run every day at 00:00 UTC
6+
workflow_dispatch:
7+
8+
jobs:
9+
main:
10+
name: Tests
11+
runs-on: ubuntu-latest
12+
strategy:
13+
fail-fast: false
14+
matrix:
15+
ruby:
16+
- '3.3'
17+
env:
18+
BUNDLE_GEMFILE: gemfiles/rails_main_native.gemfile
19+
steps:
20+
- uses: actions/checkout@v4
21+
- uses: ruby/setup-ruby@v1
22+
with:
23+
ruby-version: ${{ matrix.ruby }}
24+
bundler-cache: true
25+
- run: bundle exec rake

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ rdoc
1919
pkg
2020
vendor
2121

22+
gemfiles/rails_main.gemfile.lock

Changelog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
## Unreleased
44

5+
* Drop support for Ruby below 3.1
6+
* Add tests with Active Support 7.2 and Rails main
7+
58
## 2.9.0
69

710
* Drop Ruby < 2.7

gemfiles/rails7.2.gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
eval_gemfile 'common.rb'
2+
3+
gem 'activesupport', '~> 7.2.0'

gemfiles/rails7.2.gemfile.lock

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
PATH
2+
remote: ..
3+
specs:
4+
prop (2.9.0)
5+
6+
GEM
7+
remote: https://rubygems.org/
8+
specs:
9+
activesupport (7.2.1)
10+
base64
11+
bigdecimal
12+
concurrent-ruby (~> 1.0, >= 1.3.1)
13+
connection_pool (>= 2.2.5)
14+
drb
15+
i18n (>= 1.6, < 2)
16+
logger (>= 1.4.2)
17+
minitest (>= 5.1)
18+
securerandom (>= 0.3)
19+
tzinfo (~> 2.0, >= 2.0.5)
20+
base64 (0.2.0)
21+
bigdecimal (3.1.8)
22+
bigdecimal (3.1.8-java)
23+
concurrent-ruby (1.3.4)
24+
connection_pool (2.4.1)
25+
drb (2.2.1)
26+
i18n (1.14.6)
27+
concurrent-ruby (~> 1.0)
28+
logger (1.6.1)
29+
maxitest (4.5.0)
30+
minitest (>= 5.0.0, < 5.19.0)
31+
minitest (5.18.1)
32+
mocha (2.4.5)
33+
ruby2_keywords (>= 0.0.5)
34+
rake (13.2.1)
35+
ruby2_keywords (0.0.5)
36+
securerandom (0.3.1)
37+
tzinfo (2.0.6)
38+
concurrent-ruby (~> 1.0)
39+
40+
PLATFORMS
41+
java
42+
ruby
43+
44+
DEPENDENCIES
45+
activesupport (~> 7.2.0)
46+
maxitest (< 5)
47+
mocha
48+
prop!
49+
rake
50+
51+
BUNDLED WITH
52+
2.5.9

gemfiles/rails_main.gemfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
eval_gemfile 'common.rb'
2+
3+
gem "activesupport", github: "rails/rails"
4+

prop.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ Gem::Specification.new "prop", Prop::VERSION do |s|
1010
s.email = '[email protected]'
1111
s.homepage = 'https://github.com/zendesk/prop'
1212

13-
s.required_ruby_version = '>= 2.7'
13+
s.required_ruby_version = '>= 3.1'
1414
s.files = `git ls-files lib LICENSE README.md`.split("\n")
1515
end

0 commit comments

Comments
 (0)