mirror of
https://github.com/systemd/systemd
synced 2024-09-06 08:46:19 +00:00
ci: bring fatal-meson-warnings back
It's a follow-up to https://github.com/systemd/systemd/pull/23204 v2: replaced xargs with exec as suggested by Jan Janssen
This commit is contained in:
parent
1cd9c04ee9
commit
67b9732f1b
14
.github/workflows/build_test.sh
vendored
14
.github/workflows/build_test.sh
vendored
|
@ -123,12 +123,14 @@ for args in "${ARGS[@]}"; do
|
||||||
# src/boot/efi/meson.build:52:16: ERROR: Fatal warnings enabled, aborting
|
# src/boot/efi/meson.build:52:16: ERROR: Fatal warnings enabled, aborting
|
||||||
# when LINKER is set to lld so let's just not turn meson warnings into errors with lld
|
# when LINKER is set to lld so let's just not turn meson warnings into errors with lld
|
||||||
# to make sure that the build systemd can pick up the correct efi-ld linker automatically.
|
# to make sure that the build systemd can pick up the correct efi-ld linker automatically.
|
||||||
# We use some features (like install_tag) that were introduced in 0.60, but that don't
|
|
||||||
# break running with older versions
|
# The install_tag feature introduced in 0.60 causes meson to fail with fatal-meson-warnings
|
||||||
# FIXME: re-enable once the minimum version is bumped to 0.60
|
# "Project targeting '>= 0.53.2' but tried to use feature introduced in '0.60.0': install_tag arg in custom_target"
|
||||||
#if [[ "$LINKER" != lld ]]; then
|
# It can be safely removed from the CI since it isn't actually used anywhere to test anything.
|
||||||
# additional_meson_args="--fatal-meson-warnings"
|
find . -type f -name meson.build -exec sed -i '/install_tag/d' '{}' '+'
|
||||||
#fi
|
if [[ "$LINKER" != lld ]]; then
|
||||||
|
additional_meson_args="--fatal-meson-warnings"
|
||||||
|
fi
|
||||||
additional_meson_args=""
|
additional_meson_args=""
|
||||||
info "Checking build with $args"
|
info "Checking build with $args"
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
|
|
18
.github/workflows/unit_tests.sh
vendored
18
.github/workflows/unit_tests.sh
vendored
|
@ -60,10 +60,11 @@ for phase in "${PHASES[@]}"; do
|
||||||
# The docs build is slow and is not affected by compiler/flags, so do it just once
|
# The docs build is slow and is not affected by compiler/flags, so do it just once
|
||||||
MESON_ARGS+=(-Dman=true)
|
MESON_ARGS+=(-Dman=true)
|
||||||
fi
|
fi
|
||||||
# We use some features (like install_tag) that were introduced in 0.60, but that don't
|
# The install_tag feature introduced in 0.60 causes meson to fail with fatal-meson-warnings
|
||||||
# break running with older versions
|
# "Project targeting '>= 0.53.2' but tried to use feature introduced in '0.60.0': install_tag arg in custom_target"
|
||||||
# FIXME: re-enable once the minimum version is bumped to 0.60
|
# It can be safely removed from the CI since it isn't actually used anywhere to test anything.
|
||||||
# MESON_ARGS+=(--fatal-meson-warnings)
|
find . -type f -name meson.build -exec sed -i '/install_tag/d' '{}' '+'
|
||||||
|
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 "${MESON_ARGS[@]}" build
|
||||||
ninja -C build -v
|
ninja -C build -v
|
||||||
meson test -C build --print-errorlogs
|
meson test -C build --print-errorlogs
|
||||||
|
@ -83,10 +84,11 @@ for phase in "${PHASES[@]}"; do
|
||||||
MESON_ARGS+=(-Dskip-deps=true)
|
MESON_ARGS+=(-Dskip-deps=true)
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
# We use some features (like install_tag) that were introduced in 0.60, but that don't
|
# The install_tag feature introduced in 0.60 causes meson to fail with fatal-meson-warnings
|
||||||
# break running with older versions
|
# "Project targeting '>= 0.53.2' but tried to use feature introduced in '0.60.0': install_tag arg in custom_target"
|
||||||
# FIXME: re-enable once the minimum version is bumped to 0.60
|
# It can be safely removed from the CI since it isn't actually used anywhere to test anything.
|
||||||
# MESON_ARGS+=(--fatal-meson-warnings)
|
find . -type f -name meson.build -exec sed -i '/install_tag/d' '{}' '+'
|
||||||
|
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 "${MESON_ARGS[@]}" build
|
||||||
ninja -C build -v
|
ninja -C build -v
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue