Skip to content

Commit

Permalink
ci: add ubuntu 24.04 support, disable mainline kernel build
Browse files Browse the repository at this point in the history
third-party mainline ubuntu kernel package is broken so disable it
  • Loading branch information
svlobanov committed Dec 28, 2023
1 parent b26eda1 commit a77daef
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
4 changes: 3 additions & 1 deletion .github/workflows/build-and-run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ jobs:
"debian:trixie",
"ubuntu:20.04",
"ubuntu:22.04",
"ubuntu:24.04"
]
runs-on: ubuntu-latest
container:
Expand All @@ -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;
Expand Down Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions cmake/cpack.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit a77daef

Please sign in to comment.