Skip to content

Commit 04784e4

Browse files
committed
Reorder jobs into matrix and non-matrix. Also remove lint matrix.
1 parent a013fb5 commit 04784e4

File tree

1 file changed

+37
-36
lines changed

1 file changed

+37
-36
lines changed

.github/workflows/main_ci.yml

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,13 @@ permissions:
1010
contents: read
1111

1212
jobs:
13-
audit:
14-
runs-on: ubuntu-latest
15-
steps:
16-
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2
17-
- uses: actions/setup-node@eeb10cff27034e7acf239c5d29f62154018672fd # v3
18-
with:
19-
node-version: 'lts/*'
20-
registry-url: https://registry.npmjs.org/
21-
cache: 'npm'
22-
- run: npm ci
23-
- run: npm run audit
13+
##################
14+
# Jobs with matrix
15+
##################
2416
unit:
2517
runs-on: ubuntu-latest
2618
strategy:
19+
fail-fast: false
2720
matrix:
2821
node-version: [14, 'lts/*']
2922
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
@@ -37,20 +30,10 @@ jobs:
3730
cache: 'npm'
3831
- run: npm ci
3932
- run: npm run unit
40-
coverage:
41-
runs-on: ubuntu-latest
42-
steps:
43-
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2
44-
- uses: actions/setup-node@eeb10cff27034e7acf239c5d29f62154018672fd # v3
45-
with:
46-
node-version: 'lts/*'
47-
registry-url: https://registry.npmjs.org/
48-
cache: 'npm'
49-
- run: npm ci
50-
- run: npm run coverage
5133
integration:
5234
runs-on: ubuntu-latest
5335
strategy:
36+
fail-fast: false
5437
matrix:
5538
node-version: [14, 'lts/*']
5639
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
@@ -69,6 +52,34 @@ jobs:
6952
cache: 'npm'
7053
- run: npm ci
7154
- run: APIURL=http://127.0.0.1:8080/1 npm run integration
55+
56+
57+
58+
#####################
59+
# Jobs without matrix
60+
#####################
61+
audit:
62+
runs-on: ubuntu-latest
63+
steps:
64+
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2
65+
- uses: actions/setup-node@eeb10cff27034e7acf239c5d29f62154018672fd # v3
66+
with:
67+
node-version: 'lts/*'
68+
registry-url: https://registry.npmjs.org/
69+
cache: 'npm'
70+
- run: npm ci
71+
- run: npm run audit
72+
coverage:
73+
runs-on: ubuntu-latest
74+
steps:
75+
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2
76+
- uses: actions/setup-node@eeb10cff27034e7acf239c5d29f62154018672fd # v3
77+
with:
78+
node-version: 'lts/*'
79+
registry-url: https://registry.npmjs.org/
80+
cache: 'npm'
81+
- run: npm ci
82+
- run: npm run coverage
7283
format:
7384
runs-on: ubuntu-latest
7485
steps:
@@ -93,32 +104,22 @@ jobs:
93104
- run: npm run gitdiff:ci
94105
lint:
95106
runs-on: ubuntu-latest
96-
strategy:
97-
matrix:
98-
node-version: [14, 'lts/*']
99-
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
100107
steps:
101108
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2
102-
- name: Use Node.js ${{ matrix.node-version }}
103-
uses: actions/setup-node@eeb10cff27034e7acf239c5d29f62154018672fd # v3
109+
- uses: actions/setup-node@eeb10cff27034e7acf239c5d29f62154018672fd # v3
104110
with:
105-
node-version: ${{ matrix.node-version }}
111+
node-version: 'lts/*'
106112
registry-url: https://registry.npmjs.org/
107113
cache: 'npm'
108114
- run: npm ci
109115
- run: npm run lint
110116
lint-tests:
111117
runs-on: ubuntu-latest
112-
strategy:
113-
matrix:
114-
node-version: [14, 'lts/*']
115-
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
116118
steps:
117119
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # v2
118-
- name: Use Node.js ${{ matrix.node-version }}
119-
uses: actions/setup-node@eeb10cff27034e7acf239c5d29f62154018672fd # v3
120+
- uses: actions/setup-node@eeb10cff27034e7acf239c5d29f62154018672fd # v3
120121
with:
121-
node-version: ${{ matrix.node-version }}
122+
node-version: 'lts/*'
122123
registry-url: https://registry.npmjs.org/
123124
cache: 'npm'
124125
- run: npm ci

0 commit comments

Comments
 (0)