Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop upper limit on Rails, test Rails main, release v3.4.0 #196

Merged
merged 2 commits into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
### Unreleased

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

Expand Down
3 changes: 1 addition & 2 deletions curly-templates.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@ 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("rake")
s.add_development_dependency("rspec", ">= 3")

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

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

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

GEM
Expand Down Expand Up @@ -235,7 +235,6 @@ DEPENDENCIES
genspec!
github-markup
rails (~> 7.1.0)
railties (>= 5.1, < 7.2)
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-8'
2 changes: 1 addition & 1 deletion lib/curly/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Curly
VERSION = "3.3.0"
VERSION = "3.4.0"
end