From 4d8ef3a257351f4692c8c7eddce89438089e541f Mon Sep 17 00:00:00 2001
From: Simon Paulger <spaulger@codezen.co.uk>
Date: Sun, 25 Jan 2026 18:11:21 +0000
Subject: [PATCH] Upgrade GH workflow to use Ubuntu 24.04 and latest action
 releases

Upgrade GH workflow to use Ubuntu 24.04 and latest action releases
---
 .github/workflows/subflow-build-container-images.yml | 10 +++++-----
 .github/workflows/subflow-detect-versions.yml        |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/subflow-build-container-images.yml b/.github/workflows/subflow-build-container-images.yml
index 713bdaf..2666ba5 100644
--- a/.github/workflows/subflow-build-container-images.yml
+++ b/.github/workflows/subflow-build-container-images.yml
@@ -36,7 +36,7 @@ env:
 jobs:
   build_images:
     name: PHP ${{ matrix.version }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 120
 
     strategy:
@@ -45,10 +45,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
           cache-dependency-path: "**/*.sum"
@@ -91,7 +91,7 @@ jobs:
 
       - name: Restore package cache
         id: package_cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           key: "${{ inputs.distribution }}-${{ hashFiles('work/php.orig.tar.gz') }}-${{ hashFiles(steps.define_paths.outputs.source_path) }}"
           path: work/${{ matrix.full_sem_version }}
@@ -129,7 +129,7 @@ jobs:
 
       - name: Save deb files to build
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: php-${{ matrix.version }}
           if-no-files-found: ignore
diff --git a/.github/workflows/subflow-detect-versions.yml b/.github/workflows/subflow-detect-versions.yml
index 4b04198..47bdb0d 100644
--- a/.github/workflows/subflow-detect-versions.yml
+++ b/.github/workflows/subflow-detect-versions.yml
@@ -12,7 +12,7 @@ permissions: read-all
 jobs:
   detect_versions:
     name: Detect versions to build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 3
 
     outputs:
@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Detect versions
         id: generate-matrix