From 29d7d493041d20198bf220044f1280229eff812d Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Tue, 14 Jan 2025 16:20:17 +0100
Subject: [PATCH 1/4] Extend test matrix

This adds Rails 7.2 and 8, as well as Alchemy 7.4 and main, and sqlite
to the test matrix.

We exclude some impossible combos.
---
 .github/workflows/ci.yml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3e09f7d..2a7df83 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,20 +9,33 @@ jobs:
       fail-fast: false
       matrix:
         alchemy_branch:
-          - "7.0-stable"
           - "7.1-stable"
           - "7.2-stable"
           - "7.3-stable"
+          - "7.4-stable"
         ruby:
-          - "3.1"
           - "3.2"
           - "3.3"
+          - "3.4"
         rails:
-          - "7.0"
           - "7.1"
+          - "7.2"
         database:
           - mysql
           - postgresql
+          - sqlite
+        exclude:
+          - alchemy_branch: "7.1-stable"
+            rails: "7.2"
+          - alchemy_branch: "7.2-stable"
+            rails: "7.2"
+          - alchemy_branch: "7.1-stable"
+            ruby: "3.4"
+          - alchemy_branch: "7.2-stable"
+            ruby: "3.4"
+          - rails: "7.1"
+            ruby: "3.4"
+
     env:
       DB: ${{ matrix.database }}
       DB_USER: alchemy_user

From ef834bd1e32f07cbd334160f96c055aede8a1b4f Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Tue, 14 Jan 2025 16:48:21 +0100
Subject: [PATCH 2/4] Do not silence deprecations

The API changes with Rails 7.2, and we actually would like to see
deprecations.
---
 spec/rails_helper.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index b493444..8944bf4 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -27,8 +27,6 @@
 Capybara.ignore_hidden_elements = false
 ActiveJob::Base.queue_adapter = :test
 
-ActiveSupport::Deprecation.silenced = true
-
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
   config.use_transactional_fixtures = true

From 33952c60de28d81ceea45db9ff4959abae480811 Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Tue, 14 Jan 2025 17:35:44 +0100
Subject: [PATCH 3/4] Revert "Merge pull request #218 from mamhoff/alchemy-8"

This reverts commit f1da62c3489c61b1a54151ad036d8c8911243075, reversing
changes made to ac65a520b33af8be3cd2aaac2aaaba77df75d237.
---
 alchemy-devise.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/alchemy-devise.gemspec b/alchemy-devise.gemspec
index 2140d82..e388ed7 100644
--- a/alchemy-devise.gemspec
+++ b/alchemy-devise.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir["{app,config,db,lib}/**/*", "LICENSE", "CHANGELOG.md", "README.md"]
 
-  s.add_dependency "alchemy_cms", [">= 7.0", "<= 8.1"]
+  s.add_dependency "alchemy_cms", ["~> 7.0"]
   s.add_dependency "devise", ["~> 4.9"]
 
   s.add_development_dependency "capybara"

From a4c50cd857d21fc36d56e74c70dcb5739232064b Mon Sep 17 00:00:00 2001
From: Martin Meyerhoff <mamhoff@gmail.com>
Date: Tue, 14 Jan 2025 17:38:58 +0100
Subject: [PATCH 4/4] Restrict image to ubuntu 22.04

Ubuntu latest does not have imagemagick.
---
 .github/workflows/brakeman-analysis.yml | 2 +-
 .github/workflows/ci.yml                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/brakeman-analysis.yml b/.github/workflows/brakeman-analysis.yml
index 01b1a5b..c91f835 100644
--- a/.github/workflows/brakeman-analysis.yml
+++ b/.github/workflows/brakeman-analysis.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   brakeman-scan:
     name: Brakeman Scan
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       # Checkout the repository to the GitHub Actions runner
       - name: Checkout
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2a7df83..6371b2d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   RSpec:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -106,7 +106,7 @@ jobs:
           path: spec/dummy/tmp/screenshots
 
   Lint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     env:
       ALCHEMY_BRANCH: 7.3-stable
     steps: