From 5db785fd6a4899d5d0fa863b58d50fd1d8cac9c4 Mon Sep 17 00:00:00 2001
From: John Cooper <john.cooper@york.ac.uk>
Date: Wed, 2 Oct 2024 17:04:28 +0100
Subject: [PATCH 1/2] Add support for Ubuntu 24.04

  This adds the same settings for Debian 12.
  While Ubuntu has v21 of openjdk available it uses
  the more conservative v17
---
 manifests/params.pp | 2 +-
 metadata.json       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index a301347f..708d3e6f 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -58,7 +58,7 @@
         default   => $facts['os']['architecture']
       }
       case $facts['os']['release']['major'] {
-        '12': {
+        '12', '24.04': {
           $openjdk = 17
         }
         '10', '11', '18.04', '18.10', '19.04', '19.10', '20.04', '22.04': {
diff --git a/metadata.json b/metadata.json
index 5348561e..7a2b4144 100644
--- a/metadata.json
+++ b/metadata.json
@@ -52,7 +52,8 @@
       "operatingsystemrelease": [
         "18.04",
         "20.04",
-        "22.04"
+        "22.04",
+        "24.04"
       ]
     },
     {

From c1e0299cd68c091aab9e4b7405249ed7f2d4dc41 Mon Sep 17 00:00:00 2001
From: John Cooper <john.cooper@york.ac.uk>
Date: Fri, 8 Nov 2024 15:51:35 +0000
Subject: [PATCH 2/2] Don't test on ubuntu 24.04 for arm

---
 .github/workflows/ci.yml      | 3 +--
 .github/workflows/nightly.yml | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5c98157b..a4cc7b9d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,5 +17,4 @@ jobs:
     secrets: "inherit"
     with:
       runs_on: "ubuntu-20.04"
-      flags: "--exclude-platforms '[\"Ubuntu-22.04-arm\", \"RedHat-9-arm\", \"Debian-12-arm\"]'"
-
+      flags: "--exclude-platforms '[\"Ubuntu-24.04-arm\", \"Ubuntu-22.04-arm\", \"RedHat-9-arm\", \"Debian-12-arm\"]'"
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 963e6290..85d2bd8f 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -16,5 +16,4 @@ jobs:
     secrets: "inherit"
     with:
       runs_on: "ubuntu-20.04"
-      flags: "--exclude-platforms '[\"Ubuntu-22.04-arm\", \"RedHat-9-arm\", \"Debian-12-arm\"]'"
-
+      flags: "--exclude-platforms '[\"Ubuntu-24.04-arm\", \"Ubuntu-22.04-arm\", \"RedHat-9-arm\", \"Debian-12-arm\"]'"