Skip to content

Commit d10c27b

Browse files
authored
Merge pull request #219 from mamhoff/bump-matrix
Extend test matrix
2 parents f1da62c + a4c50cd commit d10c27b

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed

.github/workflows/brakeman-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
jobs:
1616
brakeman-scan:
1717
name: Brakeman Scan
18-
runs-on: ubuntu-latest
18+
runs-on: ubuntu-22.04
1919
steps:
2020
# Checkout the repository to the GitHub Actions runner
2121
- name: Checkout

.github/workflows/ci.yml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,38 @@ on: [push, pull_request]
44

55
jobs:
66
RSpec:
7-
runs-on: ubuntu-latest
7+
runs-on: ubuntu-22.04
88
strategy:
99
fail-fast: false
1010
matrix:
1111
alchemy_branch:
12-
- "7.0-stable"
1312
- "7.1-stable"
1413
- "7.2-stable"
1514
- "7.3-stable"
15+
- "7.4-stable"
1616
ruby:
17-
- "3.1"
1817
- "3.2"
1918
- "3.3"
19+
- "3.4"
2020
rails:
21-
- "7.0"
2221
- "7.1"
22+
- "7.2"
2323
database:
2424
- mysql
2525
- postgresql
26+
- sqlite
27+
exclude:
28+
- alchemy_branch: "7.1-stable"
29+
rails: "7.2"
30+
- alchemy_branch: "7.2-stable"
31+
rails: "7.2"
32+
- alchemy_branch: "7.1-stable"
33+
ruby: "3.4"
34+
- alchemy_branch: "7.2-stable"
35+
ruby: "3.4"
36+
- rails: "7.1"
37+
ruby: "3.4"
38+
2639
env:
2740
DB: ${{ matrix.database }}
2841
DB_USER: alchemy_user
@@ -93,7 +106,7 @@ jobs:
93106
path: spec/dummy/tmp/screenshots
94107

95108
Lint:
96-
runs-on: ubuntu-latest
109+
runs-on: ubuntu-22.04
97110
env:
98111
ALCHEMY_BRANCH: 7.3-stable
99112
steps:

alchemy-devise.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
1515

1616
s.files = Dir["{app,config,db,lib}/**/*", "LICENSE", "CHANGELOG.md", "README.md"]
1717

18-
s.add_dependency "alchemy_cms", [">= 7.0", "<= 8.1"]
18+
s.add_dependency "alchemy_cms", ["~> 7.0"]
1919
s.add_dependency "devise", ["~> 4.9"]
2020

2121
s.add_development_dependency "capybara"

spec/rails_helper.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
Capybara.ignore_hidden_elements = false
2828
ActiveJob::Base.queue_adapter = :test
2929

30-
ActiveSupport::Deprecation.silenced = true
31-
3230
RSpec.configure do |config|
3331
config.infer_spec_type_from_file_location!
3432
config.use_transactional_fixtures = true

0 commit comments

Comments
 (0)