Merge pull request #219 from mamhoff/bump-matrix

Extend test matrix
AlchemyCMS · Jan 15, 2025 · d10c27b · d10c27b
2 parents f1da62c + a4c50cd
commit d10c27b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git 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
@@ -4,25 +4,38 @@ on: [push, pull_request]
 
 jobs:
   RSpec:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       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
@@ -93,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:

diff --git 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"

diff --git 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