From 3c8b3720bae9fc5608a9fa18a6c3994a995fe657 Mon Sep 17 00:00:00 2001 From: seladb Date: Sat, 11 Jul 2026 23:49:00 -0700 Subject: [PATCH 1/2] Fix packaging issues --- .github/workflows/package.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 90ec293ee5..ce51c39f48 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -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 @@ -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 @@ -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 From d9fd5dc7ec4bd1bcd86cc41e644a87b7eb8020a5 Mon Sep 17 00:00:00 2001 From: seladb Date: Sun, 12 Jul 2026 00:08:22 -0700 Subject: [PATCH 2/2] - Add Ubuntu 26.04 instead of Ubuntu 20.04 - Fix macOS --- .github/workflows/package.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index ce51c39f48..f16edc5787 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -28,6 +28,9 @@ jobs: strategy: matrix: include: + - runner: ubuntu-latest + image: ubuntu2604 + config-zstd: OFF - runner: ubuntu-latest image: ubuntu2404 config-zstd: OFF @@ -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 @@ -170,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