diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2023-09-11 12:55:54 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2023-09-11 12:55:54 +0200 |
| commit | 7f8e01d4425d7c7ef3a1eec35dc47988281ddc8e (patch) | |
| tree | e22eac3e1366280b1f2c0327d33555da6fd2d90f | |
| parent | 835a7bafb14f400b58d0a5cf7161b6b8bec050b7 (diff) | |
Fix CI.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | .github/workflows/build.yml | 5 | ||||
| -rwxr-xr-x | scripts/get-and-build-libndpi.sh | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ff210be29..857f282c6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -178,8 +178,9 @@ 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 - sudo systemctl show ndpisrvd.service ndpid@lo.service -p SubState,ActiveState + sudo systemctl status ndpisrvd.service ndpid@lo.service || true + sudo systemctl show ndpisrvd.service ndpid@lo.service -p SubState,ActiveState || true + journalctl --no-tail --no-pager -u ndpisrvd.service -u ndpid@lo.service - name: Build against libnDPI-${{ matrix.ndpi_min_version }} if: matrix.upload == false run: | diff --git a/scripts/get-and-build-libndpi.sh b/scripts/get-and-build-libndpi.sh index cd8be48ab..be17f7687 100755 --- a/scripts/get-and-build-libndpi.sh +++ b/scripts/get-and-build-libndpi.sh @@ -62,7 +62,7 @@ GIT_SUCCESS=0 if [ -d ./.git -o -f ./.git ]; then GIT_SUCCESS=1 - if [ ! -z "${FORCE_GIT_UPDATE}" ]; then + if [ ! -z "${FORCE_GIT_UPDATE}" -a "${FORCE_GIT_UPDATE}" != "OFF" ]; then git submodule deinit --force -- ./libnDPI || { GIT_SUCCESS=0; true; } LINES_CHANGED=0 else |