Skip to content

Commit 189f357

Browse files
committed
Upgrade CI configuration and matrix, fix spec failures
1 parent ff1a603 commit 189f357

File tree

4 files changed

+20
-21
lines changed

4 files changed

+20
-21
lines changed

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
name: RuboCop
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v4
1919
- uses: ruby/setup-ruby@v1
2020
with:
21-
ruby-version: "3.1"
21+
ruby-version: "3.4"
2222
bundler-cache: true
2323
- name: Lint Ruby code with RuboCop
2424
run: |

.github/workflows/test.yml

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,34 @@ jobs:
1414
# Skip running tests for local pull requests (use push event instead), run only for foreign ones
1515
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login != github.event.pull_request.base.repo.owner.login
1616
runs-on: ubuntu-latest
17+
continue-on-error: ${{ matrix.optional || false }}
1718
strategy:
1819
fail-fast: false
1920
matrix:
2021
include:
21-
- ruby: "3.2"
22+
- ruby: "head"
2223
rails: "HEAD"
24+
optional: true
25+
- ruby: "3.4"
26+
rails: "8.0"
27+
- ruby: "3.3"
28+
rails: "7.2"
29+
- ruby: "3.2"
30+
rails: "7.1"
2331
- ruby: "3.1"
2432
rails: "7.0"
2533
- ruby: "3.0"
2634
rails: "6.1"
2735
- ruby: "2.7"
2836
rails: "6.0"
29-
container:
30-
image: ruby:${{ matrix.ruby }}
31-
env:
32-
CI: true
33-
RAILS_VERSION: ${{ matrix.rails }}
37+
env:
38+
CI: true
39+
RAILS_VERSION: ${{ matrix.rails }}
3440
steps:
35-
- uses: actions/checkout@v2
36-
- uses: actions/cache@v2
41+
- uses: actions/checkout@v4
42+
- uses: ruby/setup-ruby@v1
3743
with:
38-
path: vendor/bundle
39-
key: bundle-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}-${{ hashFiles('**/Gemfile') }}
40-
restore-keys: |
41-
bundle-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}-${{ hashFiles('**/Gemfile') }}
42-
bundle-${{ matrix.ruby }}-
43-
- name: Bundle install
44-
run: |
45-
bundle config path vendor/bundle
46-
bundle install
47-
bundle update
44+
ruby-version: ${{ matrix.ruby }}
45+
bundler-cache: true
4846
- name: Run RSpec
4947
run: bundle exec rspec

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
77
# Specify your gem's dependencies in yabeda-rails.gemspec
88
gemspec
99

10-
rails_version = ENV.fetch("RAILS_VERSION", "~> 7.0")
10+
rails_version = ENV.fetch("RAILS_VERSION", "~> 8.0")
1111
case rails_version
1212
when "HEAD"
1313
git "https://github.com/rails/rails.git" do

spec/spec_helper.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
ENV["RAILS_ENV"] = "test"
44

55
require "bundler/setup"
6+
require "logger"
67
require "debug"
78
require "yabeda/rails"
89
require "yabeda/rspec"

0 commit comments

Comments
 (0)