]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
ci: build systemd without optional dependencies
authorEvgeny Vereshchagin <evvers@ya.ru>
Tue, 22 Feb 2022 11:02:44 +0000 (11:02 +0000)
committerEvgeny Vereshchagin <evvers@ya.ru>
Tue, 22 Feb 2022 15:46:15 +0000 (15:46 +0000)
to catch issues like https://github.com/systemd/systemd/pull/22585#issuecomment-1047640155

.github/workflows/unit_tests.sh
.github/workflows/unit_tests.yml

index 37594cb95e139fceb08d89d248e178dcc360e14a..ec22bc081fc099205ead967f988b61546673f3a1 100755 (executable)
@@ -63,16 +63,20 @@ for phase in "${PHASES[@]}"; do
             ninja -C build -v
             meson test -C build --print-errorlogs
             ;;
-        RUN_ASAN_UBSAN|RUN_GCC_ASAN_UBSAN|RUN_CLANG_ASAN_UBSAN)
+        RUN_ASAN_UBSAN|RUN_GCC_ASAN_UBSAN|RUN_CLANG_ASAN_UBSAN|RUN_CLANG_ASAN_UBSAN_NO_DEPS)
             MESON_ARGS=(--optimization=1)
 
-            if [[ "$phase" = "RUN_CLANG_ASAN_UBSAN" ]]; then
+            if [[ "$phase" =~ ^RUN_CLANG_ASAN_UBSAN ]]; then
                 export CC=clang
                 export CXX=clang++
                 # Build fuzzer regression tests only with clang (for now),
                 # see: https://github.com/systemd/systemd/pull/15886#issuecomment-632689604
                 # -Db_lundef=false: See https://github.com/mesonbuild/meson/issues/764
                 MESON_ARGS+=(-Db_lundef=false -Dfuzz-tests=true)
+
+                if [[ "$phase" == "RUN_CLANG_ASAN_UBSAN_NO_DEPS" ]]; then
+                    MESON_ARGS+=(-Dskip-deps=true)
+                fi
             fi
             run_meson --fatal-meson-warnings -Dnobody-group=nogroup --werror -Dtests=unsafe -Db_sanitize=address,undefined "${MESON_ARGS[@]}" build
             ninja -C build -v
index d4a4f3c7234008857714f6881080d10452704caf..3c8fb54850f51eb473521eb55cd596f52c60a40c 100644 (file)
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        run_phase: [GCC, GCC_ASAN_UBSAN, CLANG, CLANG_ASAN_UBSAN]
+        run_phase: [GCC, GCC_ASAN_UBSAN, CLANG, CLANG_ASAN_UBSAN, CLANG_ASAN_UBSAN_NO_DEPS]
         cryptolib: [auto]
         include:
           - run_phase: GCC