From: Daan De Meyer Date: Fri, 17 Oct 2025 09:53:48 +0000 (+0200) Subject: ci: Disable bpf-framework option for build and unit test jobs X-Git-Tag: v257.11~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70f78314bb3bf35f734c1d3802b7d7e093bb9956;p=thirdparty%2Fsystemd.git ci: Disable bpf-framework option for build and unit test jobs /usr/sbin/bpftool is completely broken inside containers on Ubuntu which makes meson blow up so disable the bpf-framework stuff to avoid the issue. TODO: Drop when we move off Ubuntu Noble as this will be fixed in the next Ubuntu LTS release. (cherry picked from commit cc814110af7a453db898ea2990a0281616d5ceff) (cherry picked from commit 279465a212a18f8d58fd1ef1df33bec2d740f757) --- diff --git a/.github/workflows/build-test.sh b/.github/workflows/build-test.sh index fe27e617840..1e8daeac2c5 100755 --- a/.github/workflows/build-test.sh +++ b/.github/workflows/build-test.sh @@ -169,6 +169,7 @@ for args in "${ARGS[@]}"; do meson setup \ -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true --werror \ -Dnobody-group=nogroup -Dcryptolib="${CRYPTOLIB:?}" -Ddebug=false \ + -Dbpf-framework=disabled \ $args build; then cat build/meson-logs/meson-log.txt diff --git a/.github/workflows/unit-tests.sh b/.github/workflows/unit-tests.sh index 908682669a7..b7bafa02494 100755 --- a/.github/workflows/unit-tests.sh +++ b/.github/workflows/unit-tests.sh @@ -92,7 +92,7 @@ for phase in "${PHASES[@]}"; do fi fi MESON_ARGS+=(--fatal-meson-warnings) - run_meson -Dnobody-group=nogroup --werror -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true "${MESON_ARGS[@]}" build + run_meson -Dnobody-group=nogroup --werror -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true -Dbpf-framework=disabled "${MESON_ARGS[@]}" build ninja -C build -v # Ensure setting a timezone (like the reproducible build tests do) does not break time/date unit tests TZ=GMT+12 meson test -C build --print-errorlogs @@ -115,7 +115,7 @@ for phase in "${PHASES[@]}"; do fi fi MESON_ARGS+=(--fatal-meson-warnings) - run_meson -Dnobody-group=nogroup --werror -Dtests=unsafe -Db_sanitize=address,undefined "${MESON_ARGS[@]}" build + run_meson -Dnobody-group=nogroup --werror -Dtests=unsafe -Db_sanitize=address,undefined -Dbpf-framework=disabled "${MESON_ARGS[@]}" build ninja -C build -v export ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1