From 6a1e23427671cfa48fe06ebedad1b8c21e1ad590 Mon Sep 17 00:00:00 2001
From: Jonathan Goldfarb <jgoldfar@gmail.com>
Date: Mon, 20 May 2024 08:56:16 -0700
Subject: [PATCH] Update GHA versions

---
 .github/workflows/docker-compose-verify.yml        |  7 ++++---
 .github/workflows/node-benchmark-containerized.yml | 10 ++++++----
 .github/workflows/node-test-containerized.yml      | 10 ++++++----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/docker-compose-verify.yml b/.github/workflows/docker-compose-verify.yml
index 9b54aa6..0e486ec 100644
--- a/.github/workflows/docker-compose-verify.yml
+++ b/.github/workflows/docker-compose-verify.yml
@@ -13,9 +13,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['14', '16', '18']
+        node: ['18', '20']
         implementation: ['restify', 'plain', 'express', 'koa', 'fastify']
-    runs-on: 'ubuntu-20.04'
+        runson: ['ubuntu-20.04', 'ubuntu-22.04']
+    runs-on: ${{ matrix.runson }}
     steps:
       - name: Checkout the commit triggering this job
         uses: actions/checkout@v4
@@ -33,7 +34,7 @@ jobs:
           docker-compose run -d --service-ports backend npm run start:${{ matrix.implementation }}
 
       - name: Setup Node with npm cache
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           cache: 'npm'
diff --git a/.github/workflows/node-benchmark-containerized.yml b/.github/workflows/node-benchmark-containerized.yml
index 6d01f67..d7c6d70 100644
--- a/.github/workflows/node-benchmark-containerized.yml
+++ b/.github/workflows/node-benchmark-containerized.yml
@@ -13,14 +13,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['16', '18']
+        node: ['16', '18', '20']
         implementation: ['restify', 'plain', 'express', 'koa', 'fastify']
+        runson: ['ubuntu-20.04', 'ubuntu-22.04']
+        postgresversion: ['14.2-alpine']
         # nodeImage: ['node:14-alpine', 'node:16-alpine', 'node:17-alpine']
-    runs-on: 'ubuntu-20.04'
+    runs-on: ${{ matrix.runson }}
     services:
       # label for service - since this job doesn't run in a container, this service is accessible at localhost
       database:
-        image: postgres:14.2-alpine
+        image: postgres:${{ matrix.postgresversion }}
         ports:
           - 5432:5432
         env:
@@ -60,7 +62,7 @@ jobs:
         PGPASSWORD=password psql -h localhost -U acronymapi --dbname=defaultdb --file=initdb.sql
       #
     - name: Setup Node with npm cache
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node }}
         cache: 'npm'
diff --git a/.github/workflows/node-test-containerized.yml b/.github/workflows/node-test-containerized.yml
index abf9793..10db7e1 100644
--- a/.github/workflows/node-test-containerized.yml
+++ b/.github/workflows/node-test-containerized.yml
@@ -13,8 +13,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['16', '18']
-    runs-on: 'ubuntu-20.04'
+        node: ['18', '20']
+        runson: ['ubuntu-20.04', 'ubuntu-22.04']
+        postgresversion: ['14.2-alpine']
+    runs-on: ${{ matrix.runson }}
     # These run alongside the job.
     # See:
     # - https://docs.github.com/en/actions/using-containerized-services/about-service-containers
@@ -22,7 +24,7 @@ jobs:
     services:
       # label for service - since this job doesn't run in a container, this service is accessible at localhost
       database:
-        image: postgres:14.2-alpine
+        image: postgres:${{ matrix.postgresversion }}
         ports:
           - 5432:5432
         env:
@@ -51,7 +53,7 @@ jobs:
       # https://github.com/actions/setup-node
       # https://github.com/actions/cache is no longer needed with setup-node v2
     - name: Setup Node with npm cache
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node }}
         cache: 'npm'