Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/rtmeng/PcapPlusPlus into ref…
Browse files Browse the repository at this point in the history
…actor/pcap-cpp11-modernization
  • Loading branch information
rtmeng committed Apr 18, 2024
2 parents 9a56376 + 001a6ef commit be38278
Show file tree
Hide file tree
Showing 39 changed files with 1,302 additions and 698 deletions.
30 changes: 15 additions & 15 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -282,15 +282,15 @@ jobs:
cmake --build "$BUILD_DIR" -j
cmake --install $BUILD_DIR
- name: Build Tutorials
run: |
mkdir -p build_examples
cmake -DPCAPPP_BUILD_TUTORIALS=ON -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} -S Examples -B build_examples
cmake --build build_examples -j
# - name: Build Tutorials
# run: |
# mkdir -p build_examples
# cmake -DPCAPPP_BUILD_TUTORIALS=ON -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} -S Examples -B build_examples
# cmake --build build_examples -j

- name: Test Tutorials
if: ${{ matrix.arch == 'x86_64' }}
run: cd build_examples/tutorials_bin && ./Tutorial-HelloWorld
# - name: Test Tutorials
# if: ${{ matrix.arch == 'x86_64' }}
# run: cd build_examples/tutorials_bin && ./Tutorial-HelloWorld

- name: Create Cobertura Report
run: |
Expand Down Expand Up @@ -356,14 +356,14 @@ jobs:
cmake --build "$BUILD_DIR" -j
cmake --install "$BUILD_DIR"
- name: Build Tutorials
run: |
mkdir -p build_examples
cmake -DPCAPPP_BUILD_TUTORIALS=ON -S Examples -B build_examples
cmake --build build_examples -j
# - name: Build Tutorials
# run: |
# mkdir -p build_examples
# cmake -DPCAPPP_BUILD_TUTORIALS=ON -S Examples -B build_examples
# cmake --build build_examples -j

- name: Test Tutorials
run: cd build_examples/tutorials_bin && ./Tutorial-HelloWorld
# - name: Test Tutorials
# run: cd build_examples/tutorials_bin && ./Tutorial-HelloWorld

- name: Create Cobertura Report
run: |
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ exclude: '.*\.(pcap|pcapng|dat|txt)'
fail_fast: false
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v4.6.0
hooks:
- id: trailing-whitespace
- id: check-case-conflict
- id: end-of-file-fixer
- id: mixed-line-ending
args: ['--fix=lf']
- repo: https://github.com/psf/black
rev: 24.2.0
rev: 24.4.0
hooks:
- id: black
- repo: https://github.com/pocc/pre-commit-hooks
Expand All @@ -25,7 +25,7 @@ repos:
- id: codespell
pass_filenames: false
- repo: https://github.com/crate-ci/typos
rev: v1.19.0
rev: v1.20.8
hooks:
- id: typos
args: ['--config=typos-config.toml']
Expand Down
Loading

0 comments on commit be38278

Please sign in to comment.