Skip to content

Commit 4fbaa07

Browse files
authored
Merge pull request #196 from zendesk/nony--rails-main
Drop upper limit on Rails, test Rails main, release v3.4.0
2 parents 7524877 + d424e91 commit 4fbaa07

File tree

10 files changed

+45
-14
lines changed

10 files changed

+45
-14
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ jobs:
1919
- rails6.1
2020
- rails7.0
2121
- rails7.1
22+
- rails_main
2223
steps:
23-
- uses: zendesk/checkout@v4
24-
- uses: zendesk/setup-ruby@v1
24+
- uses: actions/checkout@v4
25+
- uses: ruby/setup-ruby@v1
2526
with:
2627
ruby-version: ${{ matrix.ruby }}
2728
bundler-cache: true
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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+
specs:
10+
name: Ruby ${{ matrix.ruby }} using ${{ matrix.gemfile }}
11+
runs-on: ubuntu-latest
12+
env:
13+
BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
ruby:
18+
- '3.3'
19+
gemfile:
20+
- rails_main
21+
steps:
22+
- uses: zendesk/checkout@v4
23+
- uses: zendesk/setup-ruby@v1
24+
with:
25+
ruby-version: ${{ matrix.ruby }}
26+
bundler-cache: true
27+
- run: bundle exec rspec

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
.config
55
coverage
66
InstalledFiles
7+
gemfiles/rails_main.gemfile.lock
78
lib/bundler/man
89
pkg
910
rdoc

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
### Unreleased
22

3+
### Curly 3.4.0 (July 2, 2024)
4+
* Drop upper limit on Rails, test with Rails main.
35
* Drop support for Ruby < 3.1.
46
* Drop support for Rails < 6.1.
57

curly-templates.gemspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ Gem::Specification.new do |s|
1818

1919
s.required_ruby_version = ">= 3.1"
2020

21-
s.add_dependency("actionpack", [">= 6.1", "< 7.2"])
21+
s.add_dependency("actionpack", ">= 6.1")
2222
s.add_dependency("sorted_set")
2323

24-
s.add_development_dependency("railties", [">= 5.1", "< 7.2"])
2524
s.add_development_dependency("rake")
2625
s.add_development_dependency("rspec", ">= 3")
2726

gemfiles/rails6.1.gemfile.lock

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ GIT
1010
PATH
1111
remote: ..
1212
specs:
13-
curly-templates (3.3.0)
14-
actionpack (>= 6.1, < 7.2)
13+
curly-templates (3.4.0)
14+
actionpack (>= 6.1)
1515
sorted_set
1616

1717
GEM
@@ -205,7 +205,6 @@ DEPENDENCIES
205205
genspec!
206206
github-markup
207207
rails (~> 6.1.0)
208-
railties (>= 5.1, < 7.2)
209208
rake
210209
redcarpet
211210
rspec (>= 3)

gemfiles/rails7.0.gemfile.lock

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ GIT
1010
PATH
1111
remote: ..
1212
specs:
13-
curly-templates (3.3.0)
14-
actionpack (>= 6.1, < 7.2)
13+
curly-templates (3.4.0)
14+
actionpack (>= 6.1)
1515
sorted_set
1616

1717
GEM
@@ -204,7 +204,6 @@ DEPENDENCIES
204204
genspec!
205205
github-markup
206206
rails (~> 7.0.0)
207-
railties (>= 5.1, < 7.2)
208207
rake
209208
redcarpet
210209
rspec (>= 3)

gemfiles/rails7.1.gemfile.lock

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ GIT
1010
PATH
1111
remote: ..
1212
specs:
13-
curly-templates (3.3.0)
14-
actionpack (>= 6.1, < 7.2)
13+
curly-templates (3.4.0)
14+
actionpack (>= 6.1)
1515
sorted_set
1616

1717
GEM
@@ -235,7 +235,6 @@ DEPENDENCIES
235235
genspec!
236236
github-markup
237237
rails (~> 7.1.0)
238-
railties (>= 5.1, < 7.2)
239238
rake
240239
redcarpet
241240
rspec (>= 3)

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 'rails', github: 'rails/rails', branch: 'main'
4+
gem 'genspec', github: 'zendesk/genspec', branch: 'rails-8'

lib/curly/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module Curly
2-
VERSION = "3.3.0"
2+
VERSION = "3.4.0"
33
end

0 commit comments

Comments
 (0)