From 5bd61a20241e56ff6b8e64bbd8426f813facc1cc Mon Sep 17 00:00:00 2001 From: Jean Boussier Date: Sun, 6 Oct 2024 11:51:57 -0400 Subject: [PATCH] Update CI matrix Rails main is no longer compatible with Ruby 3.1. --- .github/workflows/ci.yml | 14 +++++++++++--- Gemfile | 2 +- Gemfile.lock | 3 ++- gemfiles/rails_7_0_propshaft.gemfile | 2 +- gemfiles/rails_7_0_sprockets.gemfile | 2 +- gemfiles/rails_7_1_propshaft.gemfile | 2 +- gemfiles/rails_7_1_sprockets.gemfile | 2 +- gemfiles/rails_7_2_propshaft.gemfile | 23 +++++++++++++++++++++++ gemfiles/rails_7_2_sprockets.gemfile | 23 +++++++++++++++++++++++ gemfiles/rails_main_propshaft.gemfile | 2 +- gemfiles/rails_main_sprockets.gemfile | 2 +- 11 files changed, 66 insertions(+), 11 deletions(-) create mode 100644 gemfiles/rails_7_2_propshaft.gemfile create mode 100644 gemfiles/rails_7_2_sprockets.gemfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 461e6ab..735163c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,22 +6,30 @@ jobs: fail-fast: false matrix: ruby-version: - - "3.1" - "3.2" - "3.3" gemfile: - Gemfile - gemfiles/rails_7_0_propshaft.gemfile - gemfiles/rails_7_1_propshaft.gemfile + - gemfiles/rails_7_2_propshaft.gemfile - gemfiles/rails_main_propshaft.gemfile - gemfiles/rails_7_0_sprockets.gemfile - gemfiles/rails_7_1_sprockets.gemfile + - gemfiles/rails_7_2_sprockets.gemfile - gemfiles/rails_main_sprockets.gemfile - continue-on-error: [ false ] + include: + - ruby-version: "3.1" + gemfile: gemfiles/rails_7_0_propshaft.gemfile + - ruby-version: "3.1" + gemfile: gemfiles/rails_7_1_propshaft.gemfile + - ruby-version: "3.1" + gemfile: gemfiles/rails_7_0_sprockets.gemfiles + - ruby-version: "3.1" + gemfile: gemfiles/rails_7_1_sprockets.gemfiles name: ${{ format('Tests (Ruby {0}, {1})', matrix.ruby-version, matrix.gemfile) }} runs-on: ubuntu-latest - continue-on-error: ${{ matrix.continue-on-error }} env: BUNDLE_GEMFILE: ${{ matrix.gemfile }} diff --git a/Gemfile b/Gemfile index f164b69..d202db2 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gemspec gem "rails", "~> 6.1.0" -gem "sqlite3", "~> 1.4" +gem "sqlite3" group :development do gem "appraisal" diff --git a/Gemfile.lock b/Gemfile.lock index fdbca29..09b95bb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -203,6 +203,7 @@ PLATFORMS arm64-darwin-20 arm64-darwin-21 arm64-darwin-22 + arm64-darwin-23 x86_64-darwin-20 x86_64-darwin-21 x86_64-darwin-22 @@ -216,7 +217,7 @@ DEPENDENCIES rails (~> 6.1.0) rexml selenium-webdriver - sqlite3 (~> 1.4) + sqlite3 stimulus-rails turbo-rails webdrivers diff --git a/gemfiles/rails_7_0_propshaft.gemfile b/gemfiles/rails_7_0_propshaft.gemfile index 98513e3..4ac6dd2 100644 --- a/gemfiles/rails_7_0_propshaft.gemfile +++ b/gemfiles/rails_7_0_propshaft.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "rails", "~> 7.0.0" -gem "sqlite3", "~> 1.4" +gem "sqlite3" gem "propshaft" group :development do diff --git a/gemfiles/rails_7_0_sprockets.gemfile b/gemfiles/rails_7_0_sprockets.gemfile index ddd8532..f7a6267 100644 --- a/gemfiles/rails_7_0_sprockets.gemfile +++ b/gemfiles/rails_7_0_sprockets.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "rails", "~> 7.0.0" -gem "sqlite3", "~> 1.4" +gem "sqlite3" gem "sprockets-rails" group :development do diff --git a/gemfiles/rails_7_1_propshaft.gemfile b/gemfiles/rails_7_1_propshaft.gemfile index cd8e16a..bc3c7e9 100644 --- a/gemfiles/rails_7_1_propshaft.gemfile +++ b/gemfiles/rails_7_1_propshaft.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "rails", "~> 7.1.0" -gem "sqlite3", "~> 1.4" +gem "sqlite3" gem "propshaft" group :development do diff --git a/gemfiles/rails_7_1_sprockets.gemfile b/gemfiles/rails_7_1_sprockets.gemfile index 06a17c4..064e41d 100644 --- a/gemfiles/rails_7_1_sprockets.gemfile +++ b/gemfiles/rails_7_1_sprockets.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "rails", "~> 7.1.0" -gem "sqlite3", "~> 1.4" +gem "sqlite3" gem "sprockets-rails" group :development do diff --git a/gemfiles/rails_7_2_propshaft.gemfile b/gemfiles/rails_7_2_propshaft.gemfile new file mode 100644 index 0000000..326ab5a --- /dev/null +++ b/gemfiles/rails_7_2_propshaft.gemfile @@ -0,0 +1,23 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 7.2.0" +gem "sqlite3" +gem "propshaft" + +group :development do + gem "appraisal" +end + +group :test do + gem "turbo-rails" + gem "stimulus-rails" + gem "byebug" + gem "rexml" + gem "capybara" + gem "selenium-webdriver" + gem "webdrivers" +end + +gemspec path: "../" diff --git a/gemfiles/rails_7_2_sprockets.gemfile b/gemfiles/rails_7_2_sprockets.gemfile new file mode 100644 index 0000000..f5f1115 --- /dev/null +++ b/gemfiles/rails_7_2_sprockets.gemfile @@ -0,0 +1,23 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 7.2.0" +gem "sqlite3" +gem "sprockets-rails" + +group :development do + gem "appraisal" +end + +group :test do + gem "turbo-rails" + gem "stimulus-rails" + gem "byebug" + gem "rexml" + gem "capybara" + gem "selenium-webdriver" + gem "webdrivers" +end + +gemspec path: "../" diff --git a/gemfiles/rails_main_propshaft.gemfile b/gemfiles/rails_main_propshaft.gemfile index b0094e5..c69d95a 100644 --- a/gemfiles/rails_main_propshaft.gemfile +++ b/gemfiles/rails_main_propshaft.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "rails", branch: "main", git: "https://github.com/rails/rails.git" -gem "sqlite3", "~> 1.4" +gem "sqlite3" gem "propshaft" group :development do diff --git a/gemfiles/rails_main_sprockets.gemfile b/gemfiles/rails_main_sprockets.gemfile index 7d7c17d..eb0afbe 100644 --- a/gemfiles/rails_main_sprockets.gemfile +++ b/gemfiles/rails_main_sprockets.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "rails", branch: "main", git: "https://github.com/rails/rails.git" -gem "sqlite3", "~> 1.4" +gem "sqlite3" gem "sprockets-rails" group :development do