Skip to content

Fix packaging issues #2183

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 2 commits into from
Jul 12, 2026
+10 −9
Merged

Fix packaging issues #2183

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c8b372
Fix packaging issues
seladb Jul 12, 2026
d9fd5dc
- Add Ubuntu 26.04 instead of Ubuntu 20.04
seladb Jul 12, 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
19 changes: 10 additions & 9 deletions .github/workflows/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ jobs:
strategy:
matrix:
include:
- runner: ubuntu-latest
image: ubuntu2604
config-zstd: OFF
- runner: ubuntu-latest
image: ubuntu2404
config-zstd: OFF
Expand All @@ -41,9 +44,6 @@ jobs:
image: ubuntu2204-icpx
config-zstd: OFF
additional-flags: -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx
- runner: ubuntu-latest
image: ubuntu2004
config-zstd: OFF
- runner: ubuntu-latest
image: rhel94
config-zstd: OFF
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
envs: 'BUILD_DIR'
usesh: true
prepare: |
pkg install -y bash cmake git-tiny gmake gsed libpcap py311-pip
pkg install -y bash cmake git-tiny gmake gsed libpcap python
run: |
cmake -DPCAPPP_PACKAGE=ON -S . -B "$BUILD_DIR"
cmake --build "$BUILD_DIR" -j 4
Expand Down Expand Up @@ -146,9 +146,10 @@ jobs:
strategy:
matrix:
include:
- os-version: macos-14
xcode-version: 15.4
arch: x86_64
# TODO: see https://github.com/seladb/PcapPlusPlus/issues/1989
# - os-version: macos-14
# xcode-version: 15.4
# arch: x86_64
- os-version: macos-14
xcode-version: 15.4
arch: arm64
Expand All @@ -169,7 +170,7 @@ jobs:

- name: Configure PcapPlusPlus
run: |
cmake -DPCAPPP_PACKAGE=ON -DLIGHT_PCAPNG_ZSTD=${{ matrix.config-zstd }} -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} -S . -B "$BUILD_DIR"
cmake -DPCAPPP_PACKAGE=ON -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} -S . -B "$BUILD_DIR"

- name: Build PcapPlusPlus
run: cmake --build "$BUILD_DIR" -j
Expand Down Expand Up @@ -288,7 +289,7 @@ jobs:

- name: Configure PcapPlusPlus
run: |
$platform = "Visual Studio 17 2022"
$platform = "Visual Studio 18 2026"
cmake -A ${{ matrix.arch }} -G "$platform" -DPCAP_ROOT=${{ env.PCAP_SDK_DIR }} -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} -DPCAPPP_PACKAGE=ON -S . -B "$env:BUILD_DIR"

- name: Build PcapPlusPlus
Expand Down
Loading