From ae2456bc5bc4b2d86aceabad127322ea288e7005 Mon Sep 17 00:00:00 2001
From: Julian Simioni <julian@simioni.org>
Date: Tue, 26 Nov 2024 17:56:45 +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 6cc146b28..356d7f3ae 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:
           - 16.x
           - 18.x
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 558d5df8f..8c1f92953 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 58dac7f6f392338a4402f00d4e0f29313b469852 Mon Sep 17 00:00:00 2001
From: Julian Simioni <julian@simioni.org>
Date: Tue, 26 Nov 2024 17:56:51 +0100
Subject: [PATCH 2/5] CI: remove EOL Node.js 12/16/18

https://github.com/pelias/pelias/issues/950
---
 .github/workflows/_test.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml
index 356d7f3ae..fe2ee6871 100644
--- a/.github/workflows/_test.yml
+++ b/.github/workflows/_test.yml
@@ -8,7 +8,6 @@ jobs:
         os:
           - ubuntu-22.04
         node-version:
-          - 16.x
           - 18.x
           - 20.x
           - 22.x

From c2aef2d03763a24a3a98f73e48386a6ae4232f61 Mon Sep 17 00:00:00 2001
From: Julian Simioni <julian@simioni.org>
Date: Tue, 26 Nov 2024 17:56:56 +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 | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml
index fe2ee6871..11dc06e53 100644
--- a/.github/workflows/_test.yml
+++ b/.github/workflows/_test.yml
@@ -7,10 +7,7 @@ jobs:
       matrix:
         os:
           - ubuntu-22.04
-        node-version:
-          - 18.x
-          - 20.x
-          - 22.x
+        node-version: [ 18.x, 20.x, 22.x ]
     steps:
       - uses: actions/checkout@v4
       - name: 'Install node.js ${{ matrix.node-version }}'

From 25d17f4de6c752a44e9f7e2ad57bde85ccbe0914 Mon Sep 17 00:00:00 2001
From: Julian Simioni <julian@simioni.org>
Date: Tue, 26 Nov 2024 17:57:02 +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 11dc06e53..6efcedce5 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 72a4d891be9b8f0ef12d818e6e802182663c4e27 Mon Sep 17 00:00:00 2001
From: Julian Simioni <julian@simioni.org>
Date: Tue, 26 Nov 2024 17:57:07 +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