Skip to content

Commit

Permalink
Fix github actions
Browse files Browse the repository at this point in the history
  • Loading branch information
recrsn committed Sep 22, 2022
1 parent 86aa111 commit fa5bc55
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 16 deletions.
29 changes: 15 additions & 14 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,18 @@ name: ci

on:
push:
branches: [$default-branch]
branches:
- master
pull_request:
branches: [$default-branch]
branches:
- master

jobs:
build:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
strategy:
matrix:
node-version: [14.x, 16.x, 17.x, 18.x]
node-version: [14.x, 16.x, 18.x]
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
Expand All @@ -20,23 +22,22 @@ jobs:
node-version: ${{ matrix.node-version }}
- name: Install dependencies
run: |
sudo add-apt-repository -y ubuntu-toolchain-r-test
sudo apt-get -y update
sudo apt-get install -y python3 make g++-4.8
- run: npm ci
- run: npm test
sudo apt-get install -y python3 make g++
- name: Test
run: npm test

build-alpine:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
strategy:
matrix:
node-version: [14, 16, 17, 18]
node-version: [14, 16, 18]
container:
image: node:${{ matrix.node-version }}-alpine
steps:
- uses: actions/checkout@v2
- name: Install dependencies
run: |
apk add make g++ python
- run: npm ci --unsafe-perm
- run: npm test --unsafe-perm
apk add make g++ python3
- name: Test
run: |
npm test --unsafe-perm
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"url": "https://github.com/kelektiv/node.bcrypt.js/issues"
},
"scripts": {
"test": "npm install --build-from-source && nodeunit test",
"test": "npm ci --build-from-source && nodeunit test",
"install": "node-pre-gyp install --fallback-to-build"
},
"dependencies": {
Expand Down Expand Up @@ -64,4 +64,4 @@
3
]
}
}
}

0 comments on commit fa5bc55

Please sign in to comment.