From e4547abdf91990d0abb127f13937a2d15fc9ddd7 Mon Sep 17 00:00:00 2001
From: Julian Simioni <julian@simioni.org>
Date: Tue, 26 Nov 2024 17:55:26 +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 76d64da..6bfc272 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 41551fa01d95ee9bf569d834d7a18b776b0a7380 Mon Sep 17 00:00:00 2001
From: Julian Simioni <julian@simioni.org>
Date: Tue, 26 Nov 2024 17:55:28 +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 6bfc272..c82b9bc 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 90867d20e0dfe44f1c9f057639e7906ea5ca278d Mon Sep 17 00:00:00 2001
From: Julian Simioni <julian@simioni.org>
Date: Tue, 26 Nov 2024 17:55:30 +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 c82b9bc..677d3e9 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 f1baa231c1a5742f5ca93a8eaa8de469cfc78ebb Mon Sep 17 00:00:00 2001
From: Julian Simioni <julian@simioni.org>
Date: Tue, 26 Nov 2024 17:55:32 +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 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml
index 677d3e9..f3f1f85 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

From 5946050acd46fc894ab2c9eca4feb238e48b5b60 Mon Sep 17 00:00:00 2001
From: Julian Simioni <julian@simioni.org>
Date: Tue, 26 Nov 2024 17:55:35 +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