Skip to content

Commit 80266ef

Browse files
authored
Merge pull request #13 from bastelfreak/ci3
switch to voxpupuli-rubocop; generate ruby CI matrix dynamically
2 parents c138219 + f622bdb commit 80266ef

File tree

13 files changed

+1295
-439
lines changed

13 files changed

+1295
-439
lines changed

.github/workflows/lint.yaml

Lines changed: 0 additions & 27 deletions
This file was deleted.

.github/workflows/tests.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,31 @@ permissions:
1111
contents: read
1212

1313
jobs:
14+
rubocop_and_matrix:
15+
runs-on: ubuntu-24.04
16+
outputs:
17+
ruby: ${{ steps.ruby.outputs.versions }}
18+
steps:
19+
- uses: actions/checkout@v4
20+
- name: Install Ruby ${{ matrix.ruby }}
21+
uses: ruby/setup-ruby@v1
22+
with:
23+
ruby-version: "3.4"
24+
bundler-cache: true
25+
- name: Run Rubocop
26+
run: bundle exec rake rubocop
27+
- id: ruby
28+
uses: voxpupuli/ruby-version@v1
1429

1530
unit:
31+
needs: rubocop_and_matrix
1632
name: "Ruby ${{ matrix.ruby }} ${{ matrix.os }}"
1733
strategy:
1834
fail-fast: false
1935
matrix:
2036
os: [ubuntu-24.04, windows-latest]
37+
# don't generate the matrix dynamically until we switch from puppet to openvox, puppet fails on Ruby 3.4
38+
#ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
2139
ruby: ['3.2', '3.3']
2240
runs-on: ${{ matrix.os }}
2341
steps:
@@ -44,6 +62,7 @@ jobs:
4462

4563
tests:
4664
needs:
65+
- rubocop_and_matrix
4766
- unit
4867
runs-on: ubuntu-24.04
4968
name: Test suite

0 commit comments

Comments
 (0)