Skip to content

Commit

Permalink
Drop upper limit on Rails, test Rails main.
Browse files Browse the repository at this point in the history
  • Loading branch information
HeyNonster committed Jul 2, 2024
1 parent 7524877 commit 2828491
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 10 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ jobs:
- rails6.1
- rails7.0
- rails7.1
- rails_main
steps:
- uses: zendesk/checkout@v4
- uses: zendesk/setup-ruby@v1
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
Expand Down
27 changes: 27 additions & 0 deletions .github/workflows/test_against_rails_main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Test against Rails main

on:
schedule:
- cron: "0 0 * * *" # Run every day at 00:00 UTC
workflow_dispatch:

jobs:
specs:
name: Ruby ${{ matrix.ruby }} using ${{ matrix.gemfile }}
runs-on: ubuntu-latest
env:
BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
strategy:
fail-fast: false
matrix:
ruby:
- '3.3'
gemfile:
- rails_main
steps:
- uses: zendesk/checkout@v4
- uses: zendesk/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- run: bundle exec rspec
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
.config
coverage
InstalledFiles
gemfiles/rails_main.gemfile.lock
lib/bundler/man
pkg
rdoc
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
### Unreleased

* Drop upper limit on Rails, test with Rails main.
* Drop support for Ruby < 3.1.
* Drop support for Rails < 6.1.

Expand Down
4 changes: 2 additions & 2 deletions curly-templates.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ Gem::Specification.new do |s|

s.required_ruby_version = ">= 3.1"

s.add_dependency("actionpack", [">= 6.1", "< 7.2"])
s.add_dependency("actionpack", ">= 6.1")
s.add_dependency("sorted_set")

s.add_development_dependency("railties", [">= 5.1", "< 7.2"])
s.add_development_dependency("railties", ">= 5.1")
s.add_development_dependency("rake")
s.add_development_dependency("rspec", ">= 3")

Expand Down
4 changes: 2 additions & 2 deletions gemfiles/rails6.1.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ PATH
remote: ..
specs:
curly-templates (3.3.0)
actionpack (>= 6.1, < 7.2)
actionpack (>= 6.1)
sorted_set

GEM
Expand Down Expand Up @@ -205,7 +205,7 @@ DEPENDENCIES
genspec!
github-markup
rails (~> 6.1.0)
railties (>= 5.1, < 7.2)
railties (>= 5.1)
rake
redcarpet
rspec (>= 3)
Expand Down
4 changes: 2 additions & 2 deletions gemfiles/rails7.0.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ PATH
remote: ..
specs:
curly-templates (3.3.0)
actionpack (>= 6.1, < 7.2)
actionpack (>= 6.1)
sorted_set

GEM
Expand Down Expand Up @@ -204,7 +204,7 @@ DEPENDENCIES
genspec!
github-markup
rails (~> 7.0.0)
railties (>= 5.1, < 7.2)
railties (>= 5.1)
rake
redcarpet
rspec (>= 3)
Expand Down
4 changes: 2 additions & 2 deletions gemfiles/rails7.1.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ PATH
remote: ..
specs:
curly-templates (3.3.0)
actionpack (>= 6.1, < 7.2)
actionpack (>= 6.1)
sorted_set

GEM
Expand Down Expand Up @@ -235,7 +235,7 @@ DEPENDENCIES
genspec!
github-markup
rails (~> 7.1.0)
railties (>= 5.1, < 7.2)
railties (>= 5.1)
rake
redcarpet
rspec (>= 3)
Expand Down
4 changes: 4 additions & 0 deletions gemfiles/rails_main.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
eval_gemfile 'common.rb'

gem 'rails', github: 'rails/rails', branch: 'main'
gem 'genspec', github: 'zendesk/genspec', branch: 'rails-7'

0 comments on commit 2828491

Please sign in to comment.