diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 2e76057c5..4064c03a4 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -58,10 +58,8 @@ jobs: - image: ubuntu1804 python: python3.8 config-zstd: OFF - - image: centos7 - python: python3.8 - # TODO: TestLoggerMultiThread sometimes fail in CI so we exclude it for now, need to look into it - test-flags: --pcap-test-args="-s -x TestLoggerMultiThread" + - image: rhel93 + python: python3 config-zstd: OFF - image: fedora37 python: python3 diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index fa02db76e..c67e9c19c 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -24,7 +24,7 @@ jobs: config-zstd: OFF - image: ubuntu1804 config-zstd: OFF - - image: centos7 + - image: rhel93 config-zstd: OFF - image: fedora37 config-zstd: OFF diff --git a/CMakeLists.txt b/CMakeLists.txt index b4f0cf6dd..cff66721d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -377,7 +377,7 @@ if(PCAPPP_PACKAGE) set(_PCAPPP_PACKAGE_README_CUSTOM_PATH "${_PCAPPP_PACKAGE_README_PATH}/README.release.linux") if("${DISTRO_ID}" STREQUAL "ubuntu") # set(CPACK_GENERATOR ${CPACK_GENERATOR};DEB) - elseif("${DISTRO_ID}" STREQUAL "centos") + elseif("${DISTRO_ID}" STREQUAL "centos" OR "${DISTRO_ID}" STREQUAL "rhel") # set(CPACK_GENERATOR ${CPACK_GENERATOR};RPM) elseif("${DISTRO_ID}" STREQUAL "freebsd") set(_PCAPPP_PACKAGE_README_CUSTOM_PATH "${_PCAPPP_PACKAGE_README_PATH}/README.release.freebsd")