Skip to content

Commit 6a280cd

Browse files
authored
Merge pull request #133 from pelias/nodejs-18-and-ci-updates
Node.js 18 Docker image and CI updates
2 parents ee49219 + fd4080d commit 6a280cd

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

.github/workflows/_test.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@ jobs:
66
strategy:
77
matrix:
88
os:
9-
- ${{ vars.UBUNTU_VERSION }}
10-
node-version:
11-
- 12.x
12-
- 14.x
13-
- 16.x
14-
- 18.x
9+
- ubuntu-22.04
10+
node-version: [ 18.x, 20.x ]
1511
steps:
1612
- uses: actions/checkout@v4
1713
- name: 'Install node.js ${{ matrix.node-version }}'
@@ -20,5 +16,6 @@ jobs:
2016
node-version: '${{ matrix.node-version }}'
2117
- name: Run unit tests
2218
run: |
19+
[[ -f ./bin/ci-setup ]] && ./bin/ci-setup
2320
npm install
2421
npm run ci

.github/workflows/push.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
npm-publish:
77
needs: unit-tests
88
if: github.ref == 'refs/heads/master' && needs.unit-tests.result == 'success'
9-
runs-on: ${{ vars.UBUNTU_VERSION }}
9+
runs-on: ubuntu-22.04
1010
steps:
1111
- uses: actions/checkout@v4
1212
- name: Install Node.js
@@ -26,7 +26,7 @@ jobs:
2626
# note: github actions won't run a job if you don't call one of the status check functions, so `always()` is called since it evalutes to `true`
2727
if: ${{ always() && needs.unit-tests.result == 'success' && (needs.npm-publish.result == 'success' || needs.npm-publish.result == 'skipped') }}
2828
needs: [unit-tests, npm-publish]
29-
runs-on: ${{ vars.UBUNTU_VERSION }}
29+
runs-on: ubuntu-22.04
3030
steps:
3131
- uses: actions/checkout@v4
3232
- name: Build Docker images

0 commit comments

Comments
 (0)