Skip to content

Commit a40d457

Browse files
CI: Breakout jobs and support Ruby 3.3.0 (#1178)
Separate out lint and test jobs to make CI more clear. Drop matrix support, and instead update the local Ruby version to the latest version `3.3.0`, and use that in CI. Also updates test to ignore generated file that should have been ignored. Ran `bundle install` to rebuild `Gemfile.lock`.
1 parent e7926f1 commit a40d457

File tree

4 files changed

+25
-16
lines changed

4 files changed

+25
-16
lines changed

.github/workflows/main.yml

+17-10
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,28 @@ on:
88
pull_request:
99

1010
jobs:
11-
build:
11+
lint:
1212
runs-on: ubuntu-latest
13-
name: Ruby ${{ matrix.ruby }}
14-
strategy:
15-
matrix:
16-
ruby:
17-
- '3.1.4'
18-
- '3.2.2'
1913

2014
steps:
2115
- uses: actions/checkout@v4
2216
- name: Set up Ruby
2317
uses: ruby/setup-ruby@v1
2418
with:
25-
ruby-version: ${{ matrix.ruby }}
2619
bundler-cache: true
27-
- name: Run the default task
28-
run: bundle exec rake
20+
21+
- name: Lint
22+
run: bin/rails standard
23+
24+
test:
25+
runs-on: ubuntu-latest
26+
27+
steps:
28+
- uses: actions/checkout@v4
29+
- name: Set up Ruby
30+
uses: ruby/setup-ruby@v1
31+
with:
32+
bundler-cache: true
33+
34+
- name: Run tests
35+
run: bin/rails test

.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.2
1+
3.3.0

Gemfile.lock

+6-5
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ GEM
126126
net-smtp (0.4.0)
127127
net-protocol
128128
nio4r (2.5.9)
129-
nokogiri (1.15.4-arm64-darwin)
129+
nokogiri (1.16.3-arm64-darwin)
130130
racc (~> 1.4)
131-
nokogiri (1.15.4-x86_64-linux)
131+
nokogiri (1.16.3-x86_64-linux)
132132
racc (~> 1.4)
133133
parallel (1.23.0)
134134
parser (3.2.2.4)
@@ -203,8 +203,8 @@ GEM
203203
rubocop-ast (>= 0.4.0)
204204
ruby-progressbar (1.13.0)
205205
ruby2_keywords (0.0.5)
206-
sqlite3 (1.6.7-arm64-darwin)
207-
sqlite3 (1.6.7-x86_64-linux)
206+
sqlite3 (1.7.3-arm64-darwin)
207+
sqlite3 (1.7.3-x86_64-linux)
208208
standard (1.31.2)
209209
language_server-protocol (~> 3.17.0.2)
210210
lint_roller (~> 1.0)
@@ -230,7 +230,8 @@ GEM
230230
zeitwerk (2.6.12)
231231

232232
PLATFORMS
233-
ruby
233+
arm64-darwin-23
234+
x86_64-linux
234235

235236
DEPENDENCIES
236237
mocha

test/generators/suspenders/lint_generator_test.rb

+1
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ def restore_destination
260260
remove_file_if_exists ".stylelintrc.json"
261261
remove_file_if_exists ".eslintrc.json"
262262
remove_file_if_exists ".prettierrc"
263+
remove_file_if_exists ".prettierignore"
263264
remove_file_if_exists "package.json"
264265
remove_file_if_exists ".erb-lint.yml"
265266
remove_file_if_exists "config/better_html.yml"

0 commit comments

Comments
 (0)