From a77daef0c1b695b19f1989530d804262298e4d2d Mon Sep 17 00:00:00 2001
From: "Sergey V. Lobanov" <sergey@lobanov.in>
Date: Fri, 29 Dec 2023 00:25:52 +0100
Subject: ci: add ubuntu 24.04 support, disable mainline kernel build

third-party mainline ubuntu kernel package is broken so disable it
---
 .github/workflows/build-and-run.yml | 4 +++-
 .github/workflows/run-tests.yml     | 5 +++++
 cmake/cpack.cmake                   | 5 +++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-and-run.yml b/.github/workflows/build-and-run.yml
index 863be7f..8ddbafa 100644
--- a/.github/workflows/build-and-run.yml
+++ b/.github/workflows/build-and-run.yml
@@ -90,6 +90,7 @@ jobs:
             "debian:trixie",
             "ubuntu:20.04",
             "ubuntu:22.04",
+            "ubuntu:24.04"
           ]
     runs-on: ubuntu-latest
     container:
@@ -104,6 +105,7 @@ jobs:
           debian:12) DISTRO=debian12; CPACK_TYPE=Debian12 ;;
           debian:11) CPACK_TYPE=Debian11 ;;
           debian:10) CPACK_TYPE=Debian10 ;;
+          ubuntu:24.04) CPACK_TYPE=Ubuntu24 ; HEADERS_SUFFIX=generic ;;
           ubuntu:22.04) CPACK_TYPE=Ubuntu22 ; HEADERS_SUFFIX=generic ;;
           ubuntu:20.04) CPACK_TYPE=Ubuntu20 ; HEADERS_SUFFIX=generic ;;
           esac;
@@ -167,7 +169,7 @@ jobs:
           if-no-files-found: error
 
   Build-in-Container-Mainline:
-    #if: ${{ false }} # disable for now
+    if: ${{ false }} # disable for now
     runs-on: ubuntu-latest
     container:
       image: ubuntu:devel
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 87e39ab..f4e3201 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -16,6 +16,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - distro: Ubuntu-24.04
+            image: https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img
+            untar: false
+            format: qcow2
+
           - distro: Ubuntu-22.04
             image: https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img
             untar: false
diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake
index 30d7f4d..14e0624 100644
--- a/cmake/cpack.cmake
+++ b/cmake/cpack.cmake
@@ -85,6 +85,11 @@ IF(CPACK_TYPE STREQUAL Ubuntu22)
         INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
 ENDIF(CPACK_TYPE STREQUAL Ubuntu22)
 
+IF(CPACK_TYPE STREQUAL Ubuntu24)
+        SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.35), libssl3 (>= 3.0.2), libpcre3 (>= 8.39)")
+        INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
+ENDIF(CPACK_TYPE STREQUAL Ubuntu24)
+
 IF(CPACK_TYPE STREQUAL Centos7)
 	SET(CPACK_RPM_PACKAGE_LICENSE "GPL")
 	SET(CPACK_RPM_PACKAGE_URL "http://accel-ppp.org")
-- 
cgit v1.2.3