From aa90942f579b1dac6feb1118055931022db607e5 Mon Sep 17 00:00:00 2001 From: Nony Dutton Date: Tue, 2 Jul 2024 15:32:16 +0200 Subject: [PATCH 1/2] Drop upper limit on Rails, test Rails main. --- .github/workflows/ci.yml | 5 ++-- .github/workflows/test_against_rails_main.yml | 27 +++++++++++++++++++ .gitignore | 1 + CHANGELOG.md | 1 + curly-templates.gemspec | 3 +-- gemfiles/rails6.1.gemfile.lock | 3 +-- gemfiles/rails7.0.gemfile.lock | 3 +-- gemfiles/rails7.1.gemfile.lock | 3 +-- gemfiles/rails_main.gemfile | 4 +++ 9 files changed, 40 insertions(+), 10 deletions(-) create mode 100644 .github/workflows/test_against_rails_main.yml create mode 100644 gemfiles/rails_main.gemfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 866e7b3..b314e48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/.github/workflows/test_against_rails_main.yml b/.github/workflows/test_against_rails_main.yml new file mode 100644 index 0000000..c466760 --- /dev/null +++ b/.github/workflows/test_against_rails_main.yml @@ -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 diff --git a/.gitignore b/.gitignore index 237395a..1169bc6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ .config coverage InstalledFiles +gemfiles/rails_main.gemfile.lock lib/bundler/man pkg rdoc diff --git a/CHANGELOG.md b/CHANGELOG.md index 68f3ee4..651d23b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. diff --git a/curly-templates.gemspec b/curly-templates.gemspec index 5bed5e4..502ba2c 100644 --- a/curly-templates.gemspec +++ b/curly-templates.gemspec @@ -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") diff --git a/gemfiles/rails6.1.gemfile.lock b/gemfiles/rails6.1.gemfile.lock index 6d43e7e..54e3928 100644 --- a/gemfiles/rails6.1.gemfile.lock +++ b/gemfiles/rails6.1.gemfile.lock @@ -11,7 +11,7 @@ PATH remote: .. specs: curly-templates (3.3.0) - actionpack (>= 6.1, < 7.2) + actionpack (>= 6.1) sorted_set GEM @@ -205,7 +205,6 @@ DEPENDENCIES genspec! github-markup rails (~> 6.1.0) - railties (>= 5.1, < 7.2) rake redcarpet rspec (>= 3) diff --git a/gemfiles/rails7.0.gemfile.lock b/gemfiles/rails7.0.gemfile.lock index f25ab88..f083647 100644 --- a/gemfiles/rails7.0.gemfile.lock +++ b/gemfiles/rails7.0.gemfile.lock @@ -11,7 +11,7 @@ PATH remote: .. specs: curly-templates (3.3.0) - actionpack (>= 6.1, < 7.2) + actionpack (>= 6.1) sorted_set GEM @@ -204,7 +204,6 @@ DEPENDENCIES genspec! github-markup rails (~> 7.0.0) - railties (>= 5.1, < 7.2) rake redcarpet rspec (>= 3) diff --git a/gemfiles/rails7.1.gemfile.lock b/gemfiles/rails7.1.gemfile.lock index 7f5bc4d..e867ecf 100644 --- a/gemfiles/rails7.1.gemfile.lock +++ b/gemfiles/rails7.1.gemfile.lock @@ -11,7 +11,7 @@ PATH remote: .. specs: curly-templates (3.3.0) - actionpack (>= 6.1, < 7.2) + actionpack (>= 6.1) sorted_set GEM @@ -235,7 +235,6 @@ DEPENDENCIES genspec! github-markup rails (~> 7.1.0) - railties (>= 5.1, < 7.2) rake redcarpet rspec (>= 3) diff --git a/gemfiles/rails_main.gemfile b/gemfiles/rails_main.gemfile new file mode 100644 index 0000000..064a88c --- /dev/null +++ b/gemfiles/rails_main.gemfile @@ -0,0 +1,4 @@ +eval_gemfile 'common.rb' + +gem 'rails', github: 'rails/rails', branch: 'main' +gem 'genspec', github: 'zendesk/genspec', branch: 'rails-8' From d424e91db1485813cf9b0fcfc44644f75d905cb4 Mon Sep 17 00:00:00 2001 From: Nony Dutton Date: Tue, 2 Jul 2024 15:44:15 +0200 Subject: [PATCH 2/2] Release v3.4.0 * Drop upper limit on Rails, test with Rails main. * Drop support for Ruby < 3.1. * Drop support for Rails < 6.1. --- CHANGELOG.md | 1 + gemfiles/rails6.1.gemfile.lock | 2 +- gemfiles/rails7.0.gemfile.lock | 2 +- gemfiles/rails7.1.gemfile.lock | 2 +- lib/curly/version.rb | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 651d23b..992cdd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ### 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. diff --git a/gemfiles/rails6.1.gemfile.lock b/gemfiles/rails6.1.gemfile.lock index 54e3928..383313a 100644 --- a/gemfiles/rails6.1.gemfile.lock +++ b/gemfiles/rails6.1.gemfile.lock @@ -10,7 +10,7 @@ GIT PATH remote: .. specs: - curly-templates (3.3.0) + curly-templates (3.4.0) actionpack (>= 6.1) sorted_set diff --git a/gemfiles/rails7.0.gemfile.lock b/gemfiles/rails7.0.gemfile.lock index f083647..0af902e 100644 --- a/gemfiles/rails7.0.gemfile.lock +++ b/gemfiles/rails7.0.gemfile.lock @@ -10,7 +10,7 @@ GIT PATH remote: .. specs: - curly-templates (3.3.0) + curly-templates (3.4.0) actionpack (>= 6.1) sorted_set diff --git a/gemfiles/rails7.1.gemfile.lock b/gemfiles/rails7.1.gemfile.lock index e867ecf..cb7380e 100644 --- a/gemfiles/rails7.1.gemfile.lock +++ b/gemfiles/rails7.1.gemfile.lock @@ -10,7 +10,7 @@ GIT PATH remote: .. specs: - curly-templates (3.3.0) + curly-templates (3.4.0) actionpack (>= 6.1) sorted_set diff --git a/lib/curly/version.rb b/lib/curly/version.rb index 8107222..cea1c50 100644 --- a/lib/curly/version.rb +++ b/lib/curly/version.rb @@ -1,3 +1,3 @@ module Curly - VERSION = "3.3.0" + VERSION = "3.4.0" end