Skip to content

Commit fa5bc55

Browse files
committed
Fix github actions
1 parent 86aa111 commit fa5bc55

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

.github/workflows/ci.yaml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,18 @@ name: ci
22

33
on:
44
push:
5-
branches: [$default-branch]
5+
branches:
6+
- master
67
pull_request:
7-
branches: [$default-branch]
8+
branches:
9+
- master
810

911
jobs:
1012
build:
11-
runs-on: ubuntu-18.04
13+
runs-on: ubuntu-22.04
1214
strategy:
1315
matrix:
14-
node-version: [14.x, 16.x, 17.x, 18.x]
16+
node-version: [14.x, 16.x, 18.x]
1517
steps:
1618
- uses: actions/checkout@v2
1719
- name: Use Node.js ${{ matrix.node-version }}
@@ -20,23 +22,22 @@ jobs:
2022
node-version: ${{ matrix.node-version }}
2123
- name: Install dependencies
2224
run: |
23-
sudo add-apt-repository -y ubuntu-toolchain-r-test
24-
sudo apt-get -y update
25-
sudo apt-get install -y python3 make g++-4.8
26-
- run: npm ci
27-
- run: npm test
25+
sudo apt-get install -y python3 make g++
26+
- name: Test
27+
run: npm test
2828

2929
build-alpine:
30-
runs-on: ubuntu-18.04
30+
runs-on: ubuntu-22.04
3131
strategy:
3232
matrix:
33-
node-version: [14, 16, 17, 18]
33+
node-version: [14, 16, 18]
3434
container:
3535
image: node:${{ matrix.node-version }}-alpine
3636
steps:
3737
- uses: actions/checkout@v2
3838
- name: Install dependencies
3939
run: |
40-
apk add make g++ python
41-
- run: npm ci --unsafe-perm
42-
- run: npm test --unsafe-perm
40+
apk add make g++ python3
41+
- name: Test
42+
run: |
43+
npm test --unsafe-perm

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"url": "https://github.com/kelektiv/node.bcrypt.js/issues"
2626
},
2727
"scripts": {
28-
"test": "npm install --build-from-source && nodeunit test",
28+
"test": "npm ci --build-from-source && nodeunit test",
2929
"install": "node-pre-gyp install --fallback-to-build"
3030
},
3131
"dependencies": {
@@ -64,4 +64,4 @@
6464
3
6565
]
6666
}
67-
}
67+
}

0 commit comments

Comments
 (0)