From 95ae853bfdfee981df50532ca80d00a4a2b8873d Mon Sep 17 00:00:00 2001 From: Neil Carvalho Date: Fri, 7 Feb 2025 14:06:03 -0300 Subject: [PATCH 1/2] Add latest Ruby and Rails versions to the build The Rails versions had been added to the Appraisals file in previous PRs, but GitHub Actions didn't run with them because the `build.yml` file hadn't been changed. --- .github/workflows/build.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index be58cf9..c4eaa6a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,11 +10,13 @@ jobs: strategy: fail-fast: false matrix: - rails: ["7.1", "7.0", "6.1"] - ruby: ["3.3", "3.2", "3.1"] + rails: ["8.0", "7.2", "7.1", "7.0", "6.1"] + ruby: ["3.4", "3.3", "3.2", "3.1"] exclude: + # Rails >= 8.0 requires Ruby 3.2 - ruby: "3.1" - rails: "7.1" + rails: "8.0" + runs-on: 'ubuntu-latest' @@ -41,7 +43,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: "3.3" + ruby-version: "3.4" - name: Setup project run: bundle install - name: Run test From c2636a7c69080c507fb65b24e56273bed19a3c30 Mon Sep 17 00:00:00 2001 From: Neil Carvalho Date: Fri, 7 Feb 2025 14:24:06 -0300 Subject: [PATCH 2/2] Add `drb` gem to Rails 6.1 and 7.0 The `drb` gem is not a default gem on Ruby 3.4 anymore, so it needs to be on the Gemfile. Rails 7.1 and above already include it as a dependency. --- Appraisals | 6 ++++-- gemfiles/rails6.1.gemfile | 3 ++- gemfiles/rails7.0.gemfile | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Appraisals b/Appraisals index aae4545..eef44fa 100644 --- a/Appraisals +++ b/Appraisals @@ -1,23 +1,25 @@ appraise "rails6.1" do gem "byebug" + gem "concurrent-ruby", "< 1.3.5" + gem "drb" gem "listen", "~> 3.2" gem "puma", "~> 5.0" gem "rails", "~> 6.1.0", ">= 6.1.0.0" gem "spring", "!= 2.1.1" gem "spring-watcher-listen", "~> 2.0.0" gem "sqlite3", "~> 1.4" - gem "concurrent-ruby", "< 1.3.5" end appraise "rails7.0" do gem "byebug" + gem "concurrent-ruby", "< 1.3.5" + gem "drb" gem "listen", "~> 3.2" gem "puma", "~> 5.0" gem "rails", "~> 7.0.1", ">= 7.0.1" gem "spring", "!= 2.1.1" gem "spring-watcher-listen", "~> 2.0.0" gem "sqlite3", "~> 1.4" - gem "concurrent-ruby", "< 1.3.5" end appraise "rails7.1" do diff --git a/gemfiles/rails6.1.gemfile b/gemfiles/rails6.1.gemfile index 5f5d03d..fa3a335 100644 --- a/gemfiles/rails6.1.gemfile +++ b/gemfiles/rails6.1.gemfile @@ -9,12 +9,13 @@ gem "rake" gem "rspec-rails" gem "standard" gem "byebug" +gem "concurrent-ruby", "< 1.3.5" +gem "drb" gem "listen", "~> 3.2" gem "puma", "~> 5.0" gem "rails", "~> 6.1.0", ">= 6.1.0.0" gem "spring", "!= 2.1.1" gem "spring-watcher-listen", "~> 2.0.0" gem "sqlite3", "~> 1.4" -gem "concurrent-ruby", "< 1.3.5" gemspec name: "factory_bot_rails", path: "../" diff --git a/gemfiles/rails7.0.gemfile b/gemfiles/rails7.0.gemfile index ea0f7eb..08039b5 100644 --- a/gemfiles/rails7.0.gemfile +++ b/gemfiles/rails7.0.gemfile @@ -9,12 +9,13 @@ gem "rake" gem "rspec-rails" gem "standard" gem "byebug" +gem "concurrent-ruby", "< 1.3.5" +gem "drb" gem "listen", "~> 3.2" gem "puma", "~> 5.0" gem "rails", "~> 7.0.1", ">= 7.0.1" gem "spring", "!= 2.1.1" gem "spring-watcher-listen", "~> 2.0.0" gem "sqlite3", "~> 1.4" -gem "concurrent-ruby", "< 1.3.5" gemspec name: "factory_bot_rails", path: "../"