From 79cff14ef2d87c9ab5d0a9a3cd24313540a7419d Mon Sep 17 00:00:00 2001
From: Julian Simioni <julian@simioni.org>
Date: Tue, 26 Nov 2024 17:54:32 +0100
Subject: [PATCH 1/5] 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 76d64daf7..6bfc2728b 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 d2d79db70..a83dee78a 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 04949e6c5903e6a9a362046e9e1e32e5fb8b1be6 Mon Sep 17 00:00:00 2001
From: Julian Simioni <julian@simioni.org>
Date: Tue, 26 Nov 2024 17:54:34 +0100
Subject: [PATCH 2/5] 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 6bfc2728b..c82b9bc9d 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 72f187be3ea9ec091f5b27ca099506af804d62d0 Mon Sep 17 00:00:00 2001
From: Julian Simioni <julian@simioni.org>
Date: Tue, 26 Nov 2024 17:54:37 +0100
Subject: [PATCH 3/5] CI: Test Node.js versions supported by this repo

This also rewrites our CI config so that all Node.js versions are on one line for ease of future grepping

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 c82b9bc9d..677d3e978 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, 20.x ]
     steps:
       - uses: actions/checkout@v4
       - name: 'Install node.js ${{ matrix.node-version }}'

From 77816ea175191c2b6ed0c87abacee69bb163cf3b Mon Sep 17 00:00:00 2001
From: Julian Simioni <julian@simioni.org>
Date: Tue, 26 Nov 2024 17:54:39 +0100
Subject: [PATCH 4/5] CI: use standard Github Action templates

A lot of our repositories have diverged from our intended template, so this copies a templated version over whatever was here before

Connects https://github.com/pelias/pelias/issues/951
---
 .github/workflows/_test.yml | 1 +
 .github/workflows/push.yml  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml
index 677d3e978..f3f1f8594 100644
--- a/.github/workflows/_test.yml
+++ b/.github/workflows/_test.yml
@@ -16,5 +16,6 @@ jobs:
           node-version: '${{ matrix.node-version }}'
       - name: Run unit tests
         run: |
+          [[ -f ./bin/ci-setup ]] && ./bin/ci-setup
           npm install
           npm run ci
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index a83dee78a..8c1f92953 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 16.x
+          node-version: 20.x
       - name: Run semantic-release
         env:
           GH_TOKEN: ${{ secrets.GH_SEMANTIC_RELEASE_TOKEN }}

From 0d47924f81d11262c0019ddeadaa5d355425f48d Mon Sep 17 00:00:00 2001
From: Julian Simioni <julian@simioni.org>
Date: Tue, 26 Nov 2024 17:54:42 +0100
Subject: [PATCH 5/5] 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