From 2e6c3956420757b3928aa9281162780fccc369fe Mon Sep 17 00:00:00 2001 From: Julian Simioni Date: Wed, 27 Nov 2024 18:29:21 +0100 Subject: [PATCH 1/4] CI: move away from an Ubuntu version variable in GH Actions This doesn't really save us much effort and breaks CI on forks. Connects https://github.com/pelias/pelias/issues/951 --- .github/workflows/_test.yml | 2 +- .github/workflows/push.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml index 80e911d..76456d8 100644 --- a/.github/workflows/_test.yml +++ b/.github/workflows/_test.yml @@ -6,7 +6,7 @@ jobs: strategy: matrix: os: - - ${{ vars.UBUNTU_VERSION }} + - ubuntu-22.04 node-version: - 12.x - 14.x diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 558d5df..8c1f929 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -6,7 +6,7 @@ jobs: npm-publish: needs: unit-tests if: github.ref == 'refs/heads/master' && needs.unit-tests.result == 'success' - runs-on: ${{ vars.UBUNTU_VERSION }} + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: Install Node.js @@ -26,7 +26,7 @@ jobs: # 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` if: ${{ always() && needs.unit-tests.result == 'success' && (needs.npm-publish.result == 'success' || needs.npm-publish.result == 'skipped') }} needs: [unit-tests, npm-publish] - runs-on: ${{ vars.UBUNTU_VERSION }} + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: Build Docker images From e5558b2aee505be5d611d510bb811c35e84e5c52 Mon Sep 17 00:00:00 2001 From: Julian Simioni Date: Wed, 27 Nov 2024 18:29:24 +0100 Subject: [PATCH 2/4] CI: remove EOL Node.js 12/16/18 https://github.com/pelias/pelias/issues/950 --- .github/workflows/_test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml index 76456d8..6dec8dd 100644 --- a/.github/workflows/_test.yml +++ b/.github/workflows/_test.yml @@ -8,9 +8,6 @@ jobs: os: - ubuntu-22.04 node-version: - - 12.x - - 14.x - - 16.x - 18.x steps: - uses: actions/checkout@v4 From 5e0469054649eb001b5afad2e8921f12671cfd66 Mon Sep 17 00:00:00 2001 From: Julian Simioni Date: Wed, 27 Nov 2024 18:29:27 +0100 Subject: [PATCH 3/4] CI: Test against Node.js version 18 We will have to upgrade node-postal to 1.20 to support Node.js 20, and better-sqlite3 before we can support Node.js 22. This also rewrites our CI config so that all Node.js versions are on one line for ease of future grepping. Connects https://github.com/pelias/pelias/issues/950 --- .github/workflows/_test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml index 6dec8dd..4acd0b9 100644 --- a/.github/workflows/_test.yml +++ b/.github/workflows/_test.yml @@ -7,8 +7,7 @@ jobs: matrix: os: - ubuntu-22.04 - node-version: - - 18.x + node-version: [ 18.x ] steps: - uses: actions/checkout@v4 - name: 'Install node.js ${{ matrix.node-version }}' From ca7c5b1989fe811a1210775d66f7df63181ce2c1 Mon Sep 17 00:00:00 2001 From: Julian Simioni Date: Wed, 27 Nov 2024 18:29:30 +0100 Subject: [PATCH 4/4] feat(docker): Upgrade to Node.js 18 Docker baseimage BREAKING CHANGE: The Docker baseimage has been updated to use Node.js 18.20.5, so this repository's Docker image will also use it. https://github.com/pelias/pelias/issues/950