diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2024-10-31 18:12:03 +0100 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2024-11-02 18:36:54 +0100 |
| commit | ce5f448d3b690649a687e93dcdcfd59efe61ed28 (patch) | |
| tree | 50e5f1f9e1c759edfb0672386bb059676d3b2e60 /.github | |
| parent | 2b48eb051473e240735f61f41dce1c6614ca39fd (diff) | |
Switched OpenWrt GitHub Actions SDK to main branch
* fixed some SonarCloud complaints
* added more systemd CI tests
* fixed debian package scripts to obey remove/purge
* changed `chmod_chown()` error handling
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build-openwrt.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/build.yml | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/.github/workflows/build-openwrt.yml b/.github/workflows/build-openwrt.yml index 9d329d584..a9c4b6f45 100644 --- a/.github/workflows/build-openwrt.yml +++ b/.github/workflows/build-openwrt.yml @@ -42,7 +42,7 @@ jobs: fetch-depth: 1 - name: Build - uses: openwrt/gh-action-sdk@v7 + uses: openwrt/gh-action-sdk@main env: ARCH: ${{ matrix.arch }}-snapshot FEED_DIR: ${{ github.workspace }}/packages/openwrt diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3586efd9d..2ead2c26a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -285,8 +285,12 @@ jobs: sudo systemctl enable ndpid@lo sudo systemctl start ndpid@lo SYSTEMCTL_RET=3; while (( $SYSTEMCTL_RET == 3 )); do systemctl is-active ndpid@lo.service; SYSTEMCTL_RET=$?; sleep 1; done - sudo systemctl status ndpisrvd.service ndpid@lo.service || true - sudo systemctl show ndpisrvd.service ndpid@lo.service -p SubState,ActiveState || true + sudo systemctl status ndpisrvd.service ndpid@lo.service + sudo systemctl show ndpisrvd.service ndpid@lo.service -p SubState,ActiveState + sudo dpkg -i ./build/nDPId-*.deb + sudo systemctl status ndpisrvd.service ndpid@lo.service + sudo systemctl show ndpisrvd.service ndpid@lo.service -p SubState,ActiveState + sudo systemctl stop ndpisrvd.service journalctl --no-tail --no-pager -u ndpisrvd.service -u ndpid@lo.service - name: Build PF_RING and nDPId (invoke CC directly - dynamic nDPI lib) if: endsWith(matrix.compiler, 'gcc-7') == false && startsWith(matrix.ndpi_build, '-DBUILD_NDPI=ON') && startsWith(matrix.coverage, '-DENABLE_COVERAGE=OFF') && startsWith(matrix.sanitizer, '-DENABLE_SANITIZER=ON') && startsWith(matrix.ndpid_gcrypt, '-DNDPI_WITH_GCRYPT=OFF') && startsWith(matrix.ndpid_zlib, '-DENABLE_ZLIB=ON') |