Skip to content

Commit ed73d70

Browse files
authored
Clean up GitHub Actions workflow (#153)
1 parent 6e1080a commit ed73d70

File tree

2 files changed

+20
-33
lines changed

2 files changed

+20
-33
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
name: CI
1+
name: ci
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
48

59
permissions:
610
contents: read
@@ -15,14 +19,13 @@ jobs:
1519
persist-credentials: false
1620
- uses: actions/setup-node@v4
1721
with:
18-
node-version: 18
19-
cache: yarn
20-
- run: yarn install # --frozen-lockfile TODO get this option working
21-
- run: yarn lint
22-
test-js:
22+
node-version: 20
23+
- run: npm install
24+
- run: npm run lint
25+
26+
test:
2327
timeout-minutes: 2
2428
runs-on: ubuntu-latest
25-
needs: lint
2629
strategy:
2730
fail-fast: false
2831
matrix:
@@ -32,38 +35,21 @@ jobs:
3235
- '16'
3336
- '18'
3437
- '20'
35-
name: test js - node v${{ matrix.node }}
3638
steps:
3739
- uses: actions/checkout@v4
38-
with:
39-
persist-credentials: false
4040
- uses: actions/setup-node@v4
4141
with:
4242
node-version: ${{ matrix.node }}
43-
cache: yarn
44-
- run: yarn install # --frozen-lockfile TODO get this option working
45-
- run: yarn test
46-
test-ts:
43+
- run: npm install
44+
- run: npm test
45+
46+
types:
4747
timeout-minutes: 2
4848
runs-on: ubuntu-latest
49-
needs: lint
50-
strategy:
51-
fail-fast: false
52-
matrix:
53-
node:
54-
- '12'
55-
- '14'
56-
- '16'
57-
- '18'
58-
- '20'
59-
name: test ts - node v${{ matrix.node }}
6049
steps:
6150
- uses: actions/checkout@v4
62-
with:
63-
persist-credentials: false
6451
- uses: actions/setup-node@v4
6552
with:
66-
node-version: ${{ matrix.node }}
67-
cache: yarn
68-
- run: yarn install # --frozen-lockfile TODO get this option working
69-
- run: yarn test-ts
53+
node-version: '20'
54+
- run: npm install
55+
- run: npm run test-ts

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"coverage": "nyc --reporter=html npm test && open-cli coverage/index.html",
88
"coverage-ci": "nyc --reporter=lcov npm test && codecov",
99
"lint": "standard",
10-
"test": "tape test/*.js | tap-spec && npm run test-ts && npm run lint",
10+
"test": "npm run test-js && npm run test-ts && npm run lint",
11+
"test-js": "tape test/*.js | tap-spec",
1112
"test-ts": "tsd"
1213
},
1314
"repository": {

0 commit comments

Comments
 (0)