Skip to content

Commit

Permalink
workflows: fix running macos cross binaries runs
Browse files Browse the repository at this point in the history
  • Loading branch information
clementperon committed Jul 18, 2024
1 parent 0898be5 commit 1c3235b
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -269,27 +269,33 @@ jobs:
path: ${{ env.CCACHE_DIR }}
key: ${{ steps.ccache-restore.outputs.cache-primary-key }}

macos-x86:
macos:
runs-on: ${{ matrix.os-version }}
strategy:
matrix:
include:
- os-version: macos-12
host-arch: x86_64
arch: x86_64
config-zstd: OFF
- os-version: macos-12
host-arch: x86_64
arch: arm64
config-zstd: OFF
- os-version: macos-13
host-arch: x86_64
arch: x86_64
config-zstd: OFF
- os-version: macos-13
host-arch: x86_64
arch: x86_64
config-zstd: ON
- os-version: macos-13
host-arch: x86_64
arch: arm64
config-zstd: OFF
- os-version: macos-14
host-arch: arm64
arch: arm64
config-zstd: OFF

Expand Down Expand Up @@ -328,14 +334,14 @@ jobs:

- name: Test PcapPlusPlus
# We can't run cross compiled binaries
if: ${{ matrix.arch == 'x86_64' }}
if: ${{ matrix.host-arch == matrix.arch }}
run: |
python -m pip install -U pip
python -m pip install -r ci/run_tests/requirements.txt
python ci/run_tests/run_tests.py --interface en0
- name: Test Examples
if: ${{ matrix.arch == 'x86_64' }}
if: ${{ matrix.host-arch == matrix.arch }}
run: |
cd Tests/ExamplesTest
python -m pip install -U pip
Expand All @@ -355,7 +361,7 @@ jobs:
cmake --build build_examples -j
- name: Test Tutorials
if: ${{ matrix.arch == 'x86_64' }}
if: ${{ matrix.host-arch == matrix.arch }}
run: cd build_examples/tutorials_bin && ./Tutorial-HelloWorld

- name: Create Cobertura Report
Expand Down

0 comments on commit 1c3235b

Please sign in to comment.