diff options
| author | Dmitriy Eshenko <dmitriy.eshenko@accel-ppp.org> | 2023-07-18 12:27:03 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-18 12:27:03 +0300 |
| commit | 68619177404c643441e611cd022c9d5074fa81cc (patch) | |
| tree | 0307a0d569d7586da9cbd1f633529a354dacbfd7 | |
| parent | 7b7b6dabfd83eafc62555e0edc6147ebca270ac4 (diff) | |
| parent | 6355bc50bb37940e5de9553877ea61f98c1e035d (diff) | |
| download | accel-ppp-68619177404c643441e611cd022c9d5074fa81cc.tar.gz accel-ppp-68619177404c643441e611cd022c9d5074fa81cc.zip | |
Merge pull request #99 from svlobanov/deb13
Add support for Debian 13
| -rw-r--r-- | .github/workflows/build-and-run.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/run-tests.yml | 7 | ||||
| -rw-r--r-- | cmake/cpack.cmake | 5 |
3 files changed, 15 insertions, 3 deletions
diff --git a/.github/workflows/build-and-run.yml b/.github/workflows/build-and-run.yml index 39f65de..0fefd5e 100644 --- a/.github/workflows/build-and-run.yml +++ b/.github/workflows/build-and-run.yml @@ -86,7 +86,8 @@ jobs: [ "debian:10", "debian:11", - "debian:bookworm", + "debian:12", + "debian:trixie", "ubuntu:20.04", "ubuntu:22.04", ] @@ -99,7 +100,8 @@ jobs: HEADERS_SUFFIX=`uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/`; DISTRO=`echo ${{ matrix.distro }} | sed 's/://'`; case "${{ matrix.distro }}" in - debian:bookworm) DISTRO=debian12; CPACK_TYPE=Debian12 ;; + debian:trixie) DISTRO=debian13; CPACK_TYPE=Debian13 ;; + debian:12) DISTRO=debian12; CPACK_TYPE=Debian12 ;; debian:11) CPACK_TYPE=Debian11 ;; debian:10) CPACK_TYPE=Debian10 ;; ubuntu:22.04) CPACK_TYPE=Ubuntu22 ; HEADERS_SUFFIX=generic ;; diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index e2b2b81..48be9a6 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -26,8 +26,13 @@ jobs: untar: false format: qcow2 + - distro: Debian13 + image: https://cloud.debian.org/images/cloud/sid/daily/latest/debian-sid-generic-amd64-daily.tar.xz + untar: true + format: raw + - distro: Debian12 - image: https://cloud.debian.org/images/cloud/bookworm/daily/latest/debian-12-generic-amd64-daily.tar.xz + image: https://cloud.debian.org/images/cloud/bookworm/latest/debian-12-generic-amd64.tar.xz untar: true format: raw diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake index 3c4af72..30d7f4d 100644 --- a/cmake/cpack.cmake +++ b/cmake/cpack.cmake @@ -60,6 +60,11 @@ IF(CPACK_TYPE STREQUAL Debian12) INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake) ENDIF(CPACK_TYPE STREQUAL Debian12) +IF(CPACK_TYPE STREQUAL Debian13) + SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.37), libssl3 (>= 3.0.9), libpcre3 (>= 8.39)") + INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake) +ENDIF(CPACK_TYPE STREQUAL Debian13) + IF(CPACK_TYPE STREQUAL Ubuntu16) SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.23), libssl1.0.0 (>= 1.0.0), libpcre3 (>= 8.39)") INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake) |