Skip to content
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

Move Zstd tests from CirrusCI to GitHub Actions #1459

Merged
merged 4 commits into from
Jun 23, 2024
Merged

Move Zstd tests from CirrusCI to GitHub Actions #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
984c75b
-Add Zstd for Linux and macOS
seladb Jun 23, 2024
07311a2
Fix
seladb Jun 23, 2024
5292a5b
Comment out Cirrus CI tasks
seladb Jun 23, 2024
c088526
Merge from `dev`
seladb Jun 23, 2024
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
41 changes: 0 additions & 41 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,44 +26,3 @@ env:
# - python -m ensurepip
# - python -m pip install -r requirements.txt
# - python -m pytest --interface vtnet0 --root-path=../../Dist/examples_bin
#
#task:
# name: Test Zstd Linux
# container:
# image: seladb/ubuntu2004-zstd:latest
# configure_script:
# - cmake -DLIGHT_PCAPNG_ZSTD=ON -DPCAPPP_BUILD_COVERAGE=ON -S . -B Dist
# build_script:
# - cmake --build Dist -j 2
# test_pcapplusplus_script:
# - python3 -m pip install gcovr
# - python3 -m pip install -r ci/run_tests/requirements.txt
# - python3 ci/run_tests/run_tests.py --interface eth0
# coverage_report_script:
# - gcovr -v -r . $GCOVR_FLAGS -o coverage.xml
# - curl -Os https://uploader.codecov.io/latest/linux/codecov
# - chmod +x codecov
# - ./codecov -v -f coverage.xml -F zstd -F ubuntu2004 -F unittest || true
#
#task:
# name: Test Zstd MacOS
# macos_instance:
# image: ghcr.io/cirruslabs/macos-ventura-xcode:14.1
# configure_script:
# - brew install zstd
# # Ensure user have access to network devices instead of giving super-user right
# - sudo chmod a+rw /dev/bpf*
# - cmake -DLIGHT_PCAPNG_ZSTD=ON -DPCAPPP_BUILD_COVERAGE=ON -S . -B Dist
# build_script:
# - cmake --build Dist -j 2
# install_tcpreplay_gcovr_script:
# - brew install tcpreplay gcovr
# test_pcapplusplus_script:
# - python3 -m ensurepip
# - python3 -m pip install -r ci/run_tests/requirements.txt
# - python3 ci/run_tests/run_tests.py --interface en0 --pcap-test-args="-x TestPcapLiveDeviceSpecialCfg"
# coverage_report_script:
# - gcovr -v -r . $GCOVR_FLAGS -o coverage.xml
# - curl -Os https://uploader.codecov.io/latest/macos/codecov
# - chmod +x codecov
# - ./codecov -v -f coverage.xml -F zstd -F macos-ventura -F unittest || true
26 changes: 18 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,6 +63,9 @@ jobs:
- image: ubuntu2004
python: python3
config-zstd: OFF
- image: ubuntu2004-zstd
python: python3
config-zstd: ON
- image: ubuntu1804
python: python3.8
config-zstd: OFF
Expand Down Expand Up @@ -233,15 +236,22 @@ jobs:
runs-on: ${{ matrix.os-version }}
strategy:
matrix:
os-version: [macos-12, macos-13]
arch: [x86_64, arm64]
# Handle ZSTD build by Cirrus CI
# config-zstd: [ON, OFF]
config-zstd: [OFF]
exclude:
# excludes ZSTD on Arm64
- arch: arm64
include:
- os-version: macos-12
Copy link
Collaborator

Choose a reason for hiding this comment

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

no macos-14? maybe we should just maintain 13 and 14?

Copy link
Owner Author

Choose a reason for hiding this comment

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

macOS 14 is M1 only: https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories

macOS 12 and 13 are also x86_64

Copy link
Collaborator

Choose a reason for hiding this comment

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

@seladb I see, then don't we test zstd on macos 14 arm?

Copy link
Owner Author

Choose a reason for hiding this comment

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

I don't think it's necessary to test Zstd on all archs.

I tried on arm64 and it didn't work, probably because the Zstd version installed on this machine isn't compiled with arm64, so x86_64 is currently the only option

arch: x86_64
config-zstd: OFF
- os-version: macos-12
arch: arm64
config-zstd: OFF
- os-version: macos-13
arch: x86_64
config-zstd: OFF
- os-version: macos-13
arch: x86_64
config-zstd: ON
- os-version: macos-13
arch: arm64
config-zstd: OFF

steps:
- name: Checkout code
Expand Down
Loading