summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorFrantisek Sumsal <frantisek@sumsal.cz>2022-02-23 09:27:41 +0000
committerGitHub <noreply@github.com>2022-02-23 09:27:41 +0000
commit80ff9567048d0a4aa57e13e9651713798c7fe7bb (patch)
tree08ddb8a3a7931184fa8d8f638a11271f7d791b3a /.github
parent0b6c0b8083cf5eaf9bf741bf595e0c87db223619 (diff)
parentfb53316fde746f0c4bb4313a34f7cfb4e82e87cb (diff)
downloadsystemd-80ff9567048d0a4aa57e13e9651713798c7fe7bb.tar.gz
Merge pull request #22591 from evverx/no-deps
ci: build systemd without optional dependencies
Diffstat (limited to '.github')
-rwxr-xr-x.github/workflows/unit_tests.sh8
-rw-r--r--.github/workflows/unit_tests.yml2
2 files changed, 7 insertions, 3 deletions
diff --git a/.github/workflows/unit_tests.sh b/.github/workflows/unit_tests.sh
index 37594cb95e..ec22bc081f 100755
--- a/.github/workflows/unit_tests.sh
+++ b/.github/workflows/unit_tests.sh
@@ -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
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index d4a4f3c723..3c8fb54850 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -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