switch from CentOS to RedHat Entreprise Linux (#1307)

* ci: workflow: switch from CentOS to RedHat Entreprise Linux * cmake: prepare package for rhel
seladb · Feb 6, 2024 · 7d806e8 · 7d806e8
1 parent ba336be
commit 7d806e8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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")