Skip to content

Update Arm and ICPX images to Ubuntu 26.04 #2185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seladb merged 3 commits into from
Jul 14, 2026
+18 −16
Merged

Update Arm and ICPX images to Ubuntu 26.04 #2185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b0c814
Update Arm and ICPX images to Ubuntu 26.04
seladb Jul 13, 2026
feb049b
Upgrade Google Benchmark to 1.9.5
seladb Jul 13, 2026
2c20518
Add NOMINMAX compile definition
seladb Jul 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/build_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion Examples/PcapPlusPlus-benchmark/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

@seladb seladb Jul 13, 2026

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This upgrade is needed to get this fix: google/benchmark#2108 that breaks CI with ICPX: https://github.com/seladb/PcapPlusPlus/actions/runs/29216259673/job/86712680266


# Disable testing and installation for Google Benchmark
set(BENCHMARK_ENABLE_TESTING OFF)
Expand All @@ -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)

@seladb seladb Jul 13, 2026 •
edited
Loading

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is needed to fix this issue that break CI on VS 2026 (after upgrading Google Benchmark to v1.9.5): https://github.com/seladb/PcapPlusPlus/actions/runs/29217148400/job/86715127841


target_link_libraries(BenchmarkExampleGoogle PUBLIC PcapPlusPlus::Pcap++ benchmark::benchmark)

set_target_properties(BenchmarkExampleGoogle PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PCAPPP_BINARY_EXAMPLES_DIR}")
Expand Down
Loading