From 482e9d32158c9471908be33dcc0aec2889384632 Mon Sep 17 00:00:00 2001
From: "Mark S. Lewis" <Mark.S.Lewis@outlook.com>
Date: Wed, 4 Sep 2024 16:01:04 +0100
Subject: [PATCH] Use Ubuntu 24.04 for testing

Ubuntu 24.04.1 has now been released and is the current LTS release.

Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>
---
 .github/workflows/build-docs.yml |  6 +++---
 .github/workflows/push.yml       |  4 ++--
 .github/workflows/release.yml    |  6 +++---
 .github/workflows/test.yml       | 18 +++++++++---------
 docs/compatibility.md            |  2 +-
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
index 01575eb19..4db8aab5b 100644
--- a/.github/workflows/build-docs.yml
+++ b/.github/workflows/build-docs.yml
@@ -7,7 +7,7 @@ permissions:
 
 jobs:
   node:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Node documentation
     steps:
       - uses: actions/checkout@v4
@@ -23,7 +23,7 @@ jobs:
           path: node/apidocs/
 
   java:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Java documentation
     steps:
       - uses: actions/checkout@v4
@@ -41,7 +41,7 @@ jobs:
           path: java/target/reports/apidocs/
 
   site:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Documentation site
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 026f27fc1..f89e68656 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -55,7 +55,7 @@ jobs:
   publish-node:
     needs: build
     name: Publish Node package
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -73,7 +73,7 @@ jobs:
   publish-java:
     needs: build
     name: Publish Java artifact to GitHub Packages
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
       packages: write
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8bb03dc71..a2693c5a3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
   publish-node:
     needs: verify-versions
     name: Publish Node package
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -33,7 +33,7 @@ jobs:
   publish-java-github:
     needs: verify-versions
     name: Publish Java artifact to GitHub Packages
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
       packages: write
@@ -56,7 +56,7 @@ jobs:
   publish-java-ossrh:
     needs: verify-versions
     name: Publish Java artifact to Maven Central
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 55763b579..51bb42a60 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -44,7 +44,7 @@ jobs:
 
   go_unit:
     needs: verify-versions
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Unit test Go
     strategy:
       fail-fast: false
@@ -64,7 +64,7 @@ jobs:
         with:
           go-version: ${{ matrix.go-version }}
       - name: Install SoftHSM
-        run: sudo apt install -y softhsm
+        run: sudo apt install -y softhsm2
         env:
           TMPDIR: ${{ runner.temp }}
       - name: Generate mocks
@@ -79,7 +79,7 @@ jobs:
 
   go_scenario:
     needs: verify-versions
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Scenario test Go
     strategy:
       fail-fast: false
@@ -95,7 +95,7 @@ jobs:
         with:
           go-version: ${{ matrix.go-version }}
       - name: Install SoftHSM
-        run: sudo apt install -y softhsm
+        run: sudo apt install -y softhsm2
         env:
           TMPDIR: ${{ runner.temp }}
       - name: Generate mocks
@@ -107,7 +107,7 @@ jobs:
 
   node_unit:
     needs: verify-versions
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Unit test Node
     strategy:
       fail-fast: false
@@ -128,7 +128,7 @@ jobs:
 
   node_scenario:
     needs: verify-versions
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Scenario test Node
     strategy:
       fail-fast: false
@@ -147,7 +147,7 @@ jobs:
         with:
           go-version: stable
       - name: Install SoftHSM
-        run: sudo apt install -y softhsm
+        run: sudo apt install -y softhsm2
         env:
           TMPDIR: ${{ runner.temp }}
       - name: Pull Fabric Docker images
@@ -157,7 +157,7 @@ jobs:
 
   java_unit:
     needs: verify-versions
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Unit test Java
     strategy:
       fail-fast: false
@@ -186,7 +186,7 @@ jobs:
 
   java_scenario:
     needs: verify-versions
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Scenario test Java
     strategy:
       fail-fast: false
diff --git a/docs/compatibility.md b/docs/compatibility.md
index 59d69577f..b6816cec3 100644
--- a/docs/compatibility.md
+++ b/docs/compatibility.md
@@ -10,4 +10,4 @@ The following table shows versions of Fabric, programming language runtimes, and
 | **Go**       | 1.21, 1.22, 1.23 | 1.21, 1.22, 1.23 |
 | **Node**     | 18, 20, 22       | 18, 20, 22       |
 | **Java**     | 11, 17, 21       | 8, 11, 17, 21    |
-| **Platform** | Ubuntu 22.04     |                  |
+| **Platform** | Ubuntu 24.04     |                  |