From a1ac6b4d714516597d32ff5e7a41bbebcf06ecb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20H=C3=B6ppner?= Date: Sun, 9 Nov 2025 17:34:05 +0100 Subject: [PATCH 1/5] Remove unsupported versions of Ruby, Rails & Mongoid from CI matrix Rails < 7.2 doesn't get security fixes anymore. And we don't have to test with Ruby and Mongoid versions that work only with Rails < 7.2 if we don't support Rails < 7.2. --- .github/workflows/test.yml | 54 ++------------------------------------ Gemfile | 5 ---- 2 files changed, 2 insertions(+), 57 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f208f3f..af21cef 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,8 +7,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby-version: ['2.7', '3.0', '3.1', '3.2', '3.3', '3.4'] - rails-version: ['~> 6.1', '~> 7.0', '~> 7.1', '~> 7.2', '~> 8.0'] + ruby-version: ['3.1', '3.2', '3.3', '3.4'] + rails-version: ['~> 7.2', '~> 8.0'] argon2-version: ['2.2', '2.3'] orm: - adapter: active_record @@ -16,62 +16,12 @@ jobs: mongoid-version: 9.0.2 - adapter: mongoid mongoid-version: 8.1.6 - - adapter: mongoid - mongoid-version: 8.0.8 - - adapter: mongoid - mongoid-version: 7.5.4 exclude: - - rails-version: '~> 7.2' - ruby-version: '2.7' - - rails-version: '~> 7.2' - ruby-version: '3.0' - - rails-version: '~> 8.0' - ruby-version: '2.7' - - rails-version: '~> 8.0' - ruby-version: '3.0' - rails-version: '~> 8.0' ruby-version: '3.1' - - rails-version: '~> 6.1' - ruby-version: '3.4' - orm: adapter: mongoid rails-version: '~> 8.0' - - orm: - adapter: mongoid - mongoid-version: 8.0.8 - ruby-version: '3.3' - - orm: - adapter: mongoid - mongoid-version: 8.0.8 - ruby-version: '3.4' - - orm: - adapter: mongoid - mongoid-version: 8.0.8 - ruby-version: '3.2' - - orm: - adapter: mongoid - mongoid-version: 7.5.4 - ruby-version: '3.3' - - orm: - adapter: mongoid - mongoid-version: 7.5.4 - ruby-version: '3.4' - - orm: - adapter: mongoid - mongoid-version: 7.5.4 - ruby-version: '3.2' - - orm: - adapter: mongoid - mongoid-version: 8.0.8 - rails-version: '~> 7.2' - - orm: - adapter: mongoid - mongoid-version: 7.5.4 - rails-version: '~> 7.2' - - orm: - adapter: mongoid - mongoid-version: 7.5.4 - rails-version: '~> 7.1' env: RAILS_VERSION: ${{ matrix.rails-version || '~> 8.0'}} MONGOID_VERSION: ${{ matrix.orm.mongoid-version || '8.1.6'}} diff --git a/Gemfile b/Gemfile index fa18c3d..cab6dc7 100644 --- a/Gemfile +++ b/Gemfile @@ -18,8 +18,3 @@ if ENV['RAILS_VERSION'] == '~> 8.0' else gem 'sqlite3', '~> 1.6', '>= 1.6.6' end - -if ['~> 6.1', '~> 7.0'].include? ENV['RAILS_VERSION'] - gem 'concurrent-ruby', '1.3.4' -end - From 9802b83de12e602e2e940bbc3663b5129224cdb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20H=C3=B6ppner?= Date: Sun, 9 Nov 2025 17:55:56 +0100 Subject: [PATCH 2/5] Update mongoid patch version for Rails 8.0 support --- .github/workflows/test.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index af21cef..a95740f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,15 +13,12 @@ jobs: orm: - adapter: active_record - adapter: mongoid - mongoid-version: 9.0.2 + mongoid-version: 9.0.3 - adapter: mongoid - mongoid-version: 8.1.6 + mongoid-version: 8.1.7 exclude: - rails-version: '~> 8.0' ruby-version: '3.1' - - orm: - adapter: mongoid - rails-version: '~> 8.0' env: RAILS_VERSION: ${{ matrix.rails-version || '~> 8.0'}} MONGOID_VERSION: ${{ matrix.orm.mongoid-version || '8.1.6'}} From 47dd86606123307d68cc712a8e40eb554c97c683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20H=C3=B6ppner?= Date: Sun, 9 Nov 2025 17:34:37 +0100 Subject: [PATCH 3/5] Add Rails 8.1 to CI matrix --- .github/workflows/test.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a95740f..61c26a3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: ruby-version: ['3.1', '3.2', '3.3', '3.4'] - rails-version: ['~> 7.2', '~> 8.0'] + rails-version: ['~> 7.2', '~> 8.0', '~> 8.1'] argon2-version: ['2.2', '2.3'] orm: - adapter: active_record @@ -17,8 +17,13 @@ jobs: - adapter: mongoid mongoid-version: 8.1.7 exclude: + - rails-version: '~> 8.1' + ruby-version: '3.1' - rails-version: '~> 8.0' ruby-version: '3.1' + - orm: + adapter: mongoid + rails-version: '~> 8.1' env: RAILS_VERSION: ${{ matrix.rails-version || '~> 8.0'}} MONGOID_VERSION: ${{ matrix.orm.mongoid-version || '8.1.6'}} From a76916ca29460a0845a4acd0f66ff7046ebd08a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20H=C3=B6ppner?= Date: Sun, 9 Nov 2025 18:08:49 +0100 Subject: [PATCH 4/5] Use current sqlite for current Rails versions --- Gemfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index cab6dc7..6d03406 100644 --- a/Gemfile +++ b/Gemfile @@ -13,8 +13,4 @@ if ENV['ORM'] == 'mongoid' gem 'mongoid', ENV['MONGOID_VERSION'] || '~> 7.5' end -if ENV['RAILS_VERSION'] == '~> 8.0' - gem 'sqlite3', '~> 2.1' -else - gem 'sqlite3', '~> 1.6', '>= 1.6.6' -end +gem 'sqlite3', '~> 2.8' From dbc93b63115f0cee23810370699a08f2adbc2127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20H=C3=B6ppner?= Date: Sun, 9 Nov 2025 18:19:14 +0100 Subject: [PATCH 5/5] Add Devise main to CI matrix und modify gemspec --- .github/workflows/test.yml | 1 + Gemfile | 7 ++++++- devise-argon2.gemspec | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 61c26a3..9e2ea30 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,6 +10,7 @@ jobs: ruby-version: ['3.1', '3.2', '3.3', '3.4'] rails-version: ['~> 7.2', '~> 8.0', '~> 8.1'] argon2-version: ['2.2', '2.3'] + devise-version: ['~> 4.9', 'main'] orm: - adapter: active_record - adapter: mongoid diff --git a/Gemfile b/Gemfile index 6d03406..79f808f 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,12 @@ gem 'simplecov' gem 'activerecord' gem 'rails', ENV['RAILS_VERSION'] || '~> 8.0' gem 'argon2', ENV['ARGON2_VERSION'] || '~> 2.3' -gem 'devise', ENV['DEVISE_VERSION'] || '~> 4.9' + +if ENV['DEVISE_VERSION'] == 'main' + gem 'devise', github: 'heartcombo/devise' +else + gem 'devise', ENV['DEVISE_VERSION'] || '~> 4.9' +end if ENV['ORM'] == 'mongoid' gem 'mongoid', ENV['MONGOID_VERSION'] || '~> 7.5' diff --git a/devise-argon2.gemspec b/devise-argon2.gemspec index 3f57b17..0266f7c 100644 --- a/devise-argon2.gemspec +++ b/devise-argon2.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |gem| gem.test_files = gem.files.grep(%r{^(test|spec|features)/}) gem.require_paths = ["lib"] - gem.add_dependency 'devise', '~> 4.0' + gem.add_dependency 'devise', '>= 4.0' gem.add_dependency 'argon2', '~> 2.1'