Skip to content

Commit 6fa4557

Browse files
authored
Merge pull request #276 from pelias/nodejs-18-and-ci-updates
Node.js 18 Docker image and CI updates
2 parents a2f59be + e8327ef commit 6fa4557

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

.github/workflows/_test.yml

+5-7
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,16 @@ jobs:
66
strategy:
77
matrix:
88
os:
9-
- ${{ vars.UBUNTU_VERSION }}
10-
node-version:
11-
- 12.x
12-
- 14.x
13-
- 16.x
9+
- ubuntu-22.04
10+
node-version: [ 18.x, 20.x ]
1411
steps:
15-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v4
1613
- name: 'Install node.js ${{ matrix.node-version }}'
17-
uses: actions/setup-node@v2-beta
14+
uses: actions/setup-node@v4
1815
with:
1916
node-version: '${{ matrix.node-version }}'
2017
- name: Run unit tests
2118
run: |
19+
[[ -f ./bin/ci-setup ]] && ./bin/ci-setup
2220
npm install
2321
npm run ci

.github/workflows/push.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ 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:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v4
1212
- name: Install Node.js
13-
uses: actions/setup-node@v2-beta
13+
uses: actions/setup-node@v4
1414
with:
15-
node-version: 16.x
15+
node-version: 20.x
1616
- name: Run semantic-release
1717
env:
1818
GH_TOKEN: ${{ secrets.GH_SEMANTIC_RELEASE_TOKEN }}
@@ -26,9 +26,9 @@ 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:
31-
- uses: actions/checkout@v2
31+
- uses: actions/checkout@v4
3232
- name: Build Docker images
3333
env:
3434
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}

0 commit comments

Comments
 (0)