From 1b0c814b01834247aeaae39e17d3ad3885984bdb Mon Sep 17 00:00:00 2001 From: seladb Date: Sun, 12 Jul 2026 17:52:38 -0700 Subject: [PATCH 1/3] Update Arm and ICPX images to Ubuntu 26.04 --- .github/workflows/build_and_test.yml | 16 ++++++++-------- .github/workflows/package.yml | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 079c404ec0..1656f1949a 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -63,17 +63,20 @@ jobs: - runner: ubuntu-latest image: ubuntu2604 config-zstd: OFF + - runner: ubuntu-26.04-arm + image: ubuntu2604-arm64 + config-zstd: OFF - runner: ubuntu-latest - image: ubuntu2404 + image: ubuntu2604-icpx config-zstd: OFF + additional-flags: -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx + additional-gcov-flags: --gcov-executable "llvm-cov gcov" - runner: ubuntu-latest - image: ubuntu2204 + image: ubuntu2404 config-zstd: OFF - runner: ubuntu-latest - image: ubuntu2204-icpx + image: ubuntu2204 config-zstd: OFF - additional-flags: -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx - additional-gcov-flags: --gcov-executable "llvm-cov gcov" - runner: ubuntu-latest image: rhel94 config-zstd: OFF @@ -88,9 +91,6 @@ jobs: - runner: ubuntu-latest image: alpine320 config-zstd: OFF - - runner: ubuntu-24.04-arm - image: ubuntu2404-arm64 - config-zstd: OFF steps: - name: Checkout code diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index acee7b4351..d5df5dfd45 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -31,19 +31,19 @@ jobs: - runner: ubuntu-latest image: ubuntu2604 config-zstd: OFF - - runner: ubuntu-latest - image: ubuntu2404 + - runner: ubuntu-26.04-arm + image: ubuntu2604-arm64 config-zstd: OFF - - runner: ubuntu-24.04-arm - image: ubuntu2404-arm64 + - runner: ubuntu-latest + image: ubuntu2604-icpx config-zstd: OFF + additional-flags: -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx - runner: ubuntu-latest - image: ubuntu2204 + image: ubuntu2404 config-zstd: OFF - runner: ubuntu-latest - image: ubuntu2204-icpx + image: ubuntu2204 config-zstd: OFF - additional-flags: -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx - runner: ubuntu-latest image: rhel94 config-zstd: OFF From feb049b8110c9b68090a1e5f5f9848b58bad86a5 Mon Sep 17 00:00:00 2001 From: seladb Date: Sun, 12 Jul 2026 18:18:12 -0700 Subject: [PATCH 2/3] Upgrade Google Benchmark to 1.9.5 --- Examples/PcapPlusPlus-benchmark/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Examples/PcapPlusPlus-benchmark/CMakeLists.txt b/Examples/PcapPlusPlus-benchmark/CMakeLists.txt index 81955134e0..b24c7ceff5 100644 --- a/Examples/PcapPlusPlus-benchmark/CMakeLists.txt +++ b/Examples/PcapPlusPlus-benchmark/CMakeLists.txt @@ -13,7 +13,7 @@ if("cxx_std_14" IN_LIST CMAKE_CXX_COMPILE_FEATURES) include(FetchContent) # Fetch Google Benchmark - FetchContent_Declare(benchmark GIT_REPOSITORY https://github.com/google/benchmark.git GIT_TAG v1.9.0) + FetchContent_Declare(benchmark GIT_REPOSITORY https://github.com/google/benchmark.git GIT_TAG v1.9.5) # Disable testing and installation for Google Benchmark set(BENCHMARK_ENABLE_TESTING OFF) From 2c205188639e650b3756030fd5f512061cec9a61 Mon Sep 17 00:00:00 2001 From: seladb Date: Sun, 12 Jul 2026 18:29:48 -0700 Subject: [PATCH 3/3] Add NOMINMAX compile definition --- Examples/PcapPlusPlus-benchmark/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Examples/PcapPlusPlus-benchmark/CMakeLists.txt b/Examples/PcapPlusPlus-benchmark/CMakeLists.txt index b24c7ceff5..8ca24004df 100644 --- a/Examples/PcapPlusPlus-benchmark/CMakeLists.txt +++ b/Examples/PcapPlusPlus-benchmark/CMakeLists.txt @@ -22,6 +22,8 @@ if("cxx_std_14" IN_LIST CMAKE_CXX_COMPILE_FEATURES) add_executable(BenchmarkExampleGoogle benchmark-google.cpp) + target_compile_definitions(BenchmarkExampleGoogle PRIVATE NOMINMAX) + target_link_libraries(BenchmarkExampleGoogle PUBLIC PcapPlusPlus::Pcap++ benchmark::benchmark) set_target_properties(BenchmarkExampleGoogle PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PCAPPP_BINARY_EXAMPLES_DIR}")