Skip to content

Commit e060b86

Browse files
authored
Merge pull request #934 from mansona/update-github-ci
Update github CI yaml
2 parents c590272 + 845726b commit e060b86

1 file changed

Lines changed: 38 additions & 23 deletions

File tree

.github/workflows/ci.yml

Lines changed: 38 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,15 @@ name: CI
33
on:
44
push:
55
branches:
6+
- main
67
- master
78
- 'v*'
89
pull_request: {}
910

11+
concurrency:
12+
group: ci-${{ github.head_ref || github.ref }}
13+
cancel-in-progress: true
14+
1015
jobs:
1116
lint:
1217
name: Lint
@@ -20,41 +25,48 @@ jobs:
2025

2126
- run: yarn install
2227
- run: yarn lint
23-
24-
tests:
25-
name: Tests
28+
test:
29+
name: "Tests"
2630
runs-on: ubuntu-latest
31+
timeout-minutes: 10
2732

2833
steps:
29-
- uses: actions/checkout@v1
30-
- uses: actions/setup-node@v1
34+
- uses: actions/checkout@v3
35+
- name: Install Node
36+
uses: actions/setup-node@v3
3137
with:
32-
node-version: 14
33-
34-
- run: yarn install
35-
- run: yarn node-test-with-coverage
36-
37-
floating-deps:
38-
name: Tests (floating dependencies)
38+
node-version: 14.x
39+
cache: yarn
40+
- name: Install Dependencies
41+
run: yarn install --frozen-lockfile
42+
- name: Run Tests
43+
run: yarn node-test-with-coverage
44+
45+
floating:
46+
name: "Floating Dependencies"
3947
runs-on: ubuntu-latest
48+
timeout-minutes: 10
4049

4150
steps:
42-
- uses: actions/checkout@v1
43-
- uses: actions/setup-node@v1
51+
- uses: actions/checkout@v3
52+
- uses: actions/setup-node@v3
4453
with:
45-
node-version: 14
46-
47-
- run: yarn install --no-lockfile
48-
- run: yarn node-test
54+
node-version: 14.x
55+
cache: yarn
56+
- name: Install Dependencies
57+
run: yarn install --no-lockfile
58+
- name: Run Tests
59+
run: yarn node-test
4960

5061
all-commands-smoke-tests:
5162
name: Tests (commands smoke test)
5263
runs-on: ubuntu-latest
64+
timeout-minutes: 20
5365

5466
needs:
5567
- lint
56-
- tests
57-
- floating-deps
68+
- test
69+
- floating
5870

5971
strategy:
6072
fail-fast: false
@@ -143,10 +155,11 @@ jobs:
143155

144156
name: Smoke Tests (Node v${{ matrix.node }} with npm)
145157
runs-on: ubuntu-latest
158+
timeout-minutes: 20
146159

147160
needs:
148161
- lint
149-
- tests
162+
- test
150163

151164
steps:
152165
- uses: actions/checkout@v1
@@ -169,10 +182,11 @@ jobs:
169182

170183
name: Smoke Tests (Node v${{ matrix.node }} with yarn)
171184
runs-on: ubuntu-latest
185+
timeout-minutes: 20
172186

173187
needs:
174188
- lint
175-
- tests
189+
- test
176190

177191
steps:
178192
- uses: actions/checkout@v1
@@ -191,10 +205,11 @@ jobs:
191205
windows-smoke-tests:
192206
name: Smoke Tests (Windows)
193207
runs-on: windows-latest
208+
timeout-minutes: 20
194209

195210
needs:
196211
- lint
197-
- tests
212+
- test
198213

199214
steps:
200215
- uses: actions/checkout@v1

0 commit comments

Comments
 (0)