Skip to content

Commit

Permalink
Merge branch 'dev' into stepsecurity_remediation_1713273502
Browse files Browse the repository at this point in the history
  • Loading branch information
egecetin authored Apr 17, 2024
2 parents 12d3c66 + 0c75603 commit 1995cf9
Show file tree
Hide file tree
Showing 47 changed files with 1,206 additions and 619 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 @@ -285,15 +285,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 @@ -359,14 +359,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
2 changes: 1 addition & 1 deletion .github/workflows/check_dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
- uses: marocchino/validate-dependabot@0ff4b99d8d7297328dc50dc69a0796bd0607c07e # v2.2.0
- uses: marocchino/validate-dependabot@d8ae5c0d03dd75fbd0ad5f8ab4ba8101ebbd4b37 # v3.0.0
id: validate
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 1995cf9

Please sign in to comment.