Skip to content

Commit c902224

Browse files
committed
Simplify matrix config, update comments
1 parent 117b951 commit c902224

1 file changed

Lines changed: 23 additions & 33 deletions

File tree

.github/workflows/main.yml

Lines changed: 23 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Note that the workflows below use Powershell (pwsh) as they were originally written for Windows runners.
12
name: Rtools & ARM64 CI
23

34
on:
@@ -20,22 +21,19 @@ concurrency:
2021

2122
jobs:
2223
prim-rev:
23-
name: ${{ matrix.config.label }} tests (${{ matrix.config.os }})
24-
runs-on: ${{ matrix.config.os }}
24+
name: ${{ matrix.config.label }} tests (${{ matrix.os }})
25+
runs-on: ${{ matrix.os }}
2526
strategy:
2627
fail-fast: false
2728
matrix:
28-
config:
29-
- { os: windows-latest, label: misc, tests: 'test/unit/*_test.cpp test/unit/math/*_test.cpp test/unit/math/memory' }
30-
- { os: ubuntu-24.04-arm, label: misc, tests: 'test/unit/*_test.cpp test/unit/math/*_test.cpp test/unit/math/memory' }
31-
- { os: windows-latest, label: prim, tests: 'test/unit/math/prim' }
32-
- { os: ubuntu-24.04-arm, label: prim, tests: 'test/unit/math/prim' }
33-
- { os: windows-latest, label: rev, tests: 'test/unit/math/rev' }
34-
- { os: ubuntu-24.04-arm, label: rev, tests: 'test/unit/math/rev' }
35-
- { os: windows-latest, label: fwd, tests: 'test/unit/math/fwd' }
36-
- { os: ubuntu-24.04-arm, label: fwd, tests: 'test/unit/math/fwd' }
37-
- { os: windows-latest, label: 'non-fun mix', tests: 'test/unit/math/mix/core test/unit/math/mix/meta test/unit/math/mix/*_test.cpp' }
38-
- { os: ubuntu-24.04-arm, label: 'non-fun mix', tests: 'test/unit/math/mix/core test/unit/math/mix/meta test/unit/math/mix/*_test.cpp' }
29+
os: [windows-latest, ubuntu-24.04-arm]
30+
config: [
31+
{ label: misc, tests: 'test/unit/*_test.cpp test/unit/math/*_test.cpp test/unit/math/memory' },
32+
{ label: prim, tests: 'test/unit/math/prim' },
33+
{ label: rev, tests: 'test/unit/math/rev' },
34+
{ label: fwd, tests: 'test/unit/math/fwd' },
35+
{ label: 'non-fun mix', tests: 'test/unit/math/mix/core test/unit/math/mix/meta test/unit/math/mix/*_test.cpp' }
36+
]
3937

4038
steps:
4139
- uses: actions/checkout@v4
@@ -77,22 +75,13 @@ jobs:
7775
path: '**/*_test.xml'
7876

7977
mix-fun:
80-
name: mix fun and prob tests ${{ matrix.config.group }} (${{ matrix.config.os }})
81-
runs-on: ${{ matrix.config.os }}
78+
name: mix fun and prob tests ${{ matrix.group }} (${{ matrix.os }})
79+
runs-on: ${{ matrix.os }}
8280
strategy:
8381
fail-fast: false
8482
matrix:
85-
config:
86-
- { os: windows-latest, group: 1 }
87-
- { os: ubuntu-24.04-arm, group: 1 }
88-
- { os: windows-latest, group: 2 }
89-
- { os: ubuntu-24.04-arm, group: 2 }
90-
- { os: windows-latest, group: 3 }
91-
- { os: ubuntu-24.04-arm, group: 3 }
92-
- { os: windows-latest, group: 4 }
93-
- { os: ubuntu-24.04-arm, group: 4 }
94-
- { os: windows-latest, group: 5 }
95-
- { os: ubuntu-24.04-arm, group: 5 }
83+
os: [windows-latest, ubuntu-24.04-arm]
84+
group: [1, 2, 3, 4, 5]
9685

9786
steps:
9887
- uses: actions/checkout@v4
@@ -128,14 +117,15 @@ jobs:
128117
$NumberTests = $MixFunProbTests.Length
129118
$FifthNumberTests = [math]::Floor($NumberTests / 5)
130119
131-
$MixFunProbTests1 = $MixFunProbTests[0..($FifthNumberTests - 1)]
132-
$MixFunProbTests2 = $MixFunProbTests[$FifthNumberTests..(2 * $FifthNumberTests - 1)]
133-
$MixFunProbTests3 = $MixFunProbTests[(2 * $FifthNumberTests)..(3 * $FifthNumberTests - 1)]
134-
$MixFunProbTests4 = $MixFunProbTests[(3 * $FifthNumberTests)..(4 * $FifthNumberTests - 1)]
135-
$MixFunProbTests5 = $MixFunProbTests[(4 * $FifthNumberTests)..($NumberTests - 1)]
136-
$MixFunProbTestsArray = @($MixFunProbTests1, $MixFunProbTests2, $MixFunProbTests3, $MixFunProbTests4, $MixFunProbTests5)
120+
$MixFunProbTestsArray = @( `
121+
$MixFunProbTests[0..($FifthNumberTests - 1)], `
122+
$MixFunProbTests[$FifthNumberTests..(2 * $FifthNumberTests - 1)], `
123+
$MixFunProbTests[(2 * $FifthNumberTests)..(3 * $FifthNumberTests - 1)], `
124+
$MixFunProbTests[(3 * $FifthNumberTests)..(4 * $FifthNumberTests - 1)], `
125+
$MixFunProbTests[(4 * $FifthNumberTests)..($NumberTests - 1)] `
126+
)
137127
138-
python runTests.py -j2 $MixFunProbTestsArray[(${{ matrix.config.group }} - 1)]
128+
python runTests.py -j2 $MixFunProbTestsArray[(${{ matrix.group }} - 1)]
139129
140130
- name: Upload gtest_output xml
141131
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)