diff options
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/build-msbuild.yml | 14 | ||||
| -rw-r--r-- | .github/workflows/build.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/build_scheduled.yml | 4 |
3 files changed, 15 insertions, 7 deletions
diff --git a/.github/workflows/build-msbuild.yml b/.github/workflows/build-msbuild.yml index 323662c53..b3bb4d13b 100644 --- a/.github/workflows/build-msbuild.yml +++ b/.github/workflows/build-msbuild.yml @@ -11,8 +11,12 @@ on: types: [created] jobs: test: - name: MSBuild - runs-on: windows-latest + name: MSBuild ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: true + matrix: + os: ["windows-latest", "windows-11-arm"] steps: - name: Checkout uses: actions/checkout@v4 @@ -27,10 +31,10 @@ jobs: run: msbuild windows/nDPI.sln -t:rebuild -property:Configuration=Debug - name: Download Npcap - run: Invoke-WebRequest -Uri 'https://npcap.com/dist/npcap-1.71.exe' -OutFile 'C:\npcap-1.71.exe' + run: Invoke-WebRequest -Uri 'https://npcap.com/dist/npcap-1.81.exe' -OutFile 'C:\npcap-1.81.exe' - name: Install Npcap - run: C:\npcap-1.71.exe /S /winpcap_mode=yes + run: C:\npcap-1.81.exe /S /winpcap_mode=yes - name: Build ndpiReader (debug) run: msbuild windows/nDPI.sln -t:rebuild -property:Configuration=Debug-ndpiReader @@ -38,6 +42,6 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: build-artifacts + name: build-artifacts-${{ matrix.os }} path: windows/bin retention-days: 14 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b54c96ad8..75c236053 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -297,6 +297,8 @@ jobs: msys2 -c 'ldd ./example/ndpiReader.exe' - name: Tests run: | - msys2 -c 'NDPI_FORCE_PARALLEL_UTESTS=1 NDPI_SKIP_PARALLEL_BAR=1 ./tests/do.sh' + # Don't know why but lately the script in parallel mode is stuck... + #msys2 -c 'NDPI_FORCE_PARALLEL_UTESTS=1 NDPI_SKIP_PARALLEL_BAR=1 ./tests/do.sh' + msys2 -c './tests/do.sh' msys2 -c './tests/do-unit.sh' msys2 -c './tests/do-dga.sh' diff --git a/.github/workflows/build_scheduled.yml b/.github/workflows/build_scheduled.yml index 997d08fe7..1f73160b8 100644 --- a/.github/workflows/build_scheduled.yml +++ b/.github/workflows/build_scheduled.yml @@ -199,7 +199,9 @@ jobs: msys2 -c 'ldd ./example/ndpiReader.exe' - name: Tests run: | - msys2 -c 'NDPI_FORCE_PARALLEL_UTESTS=1 NDPI_SKIP_PARALLEL_BAR=1 ./tests/do.sh' + # Don't know why but lately the script in parallel mode is stuck... + #msys2 -c 'NDPI_FORCE_PARALLEL_UTESTS=1 NDPI_SKIP_PARALLEL_BAR=1 ./tests/do.sh' + msys2 -c './tests/do.sh' msys2 -c './tests/do-unit.sh' msys2 -c './tests/do-dga.sh' |