summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2023-01-11 15:04:11 +0100
committerLennart Poettering <lennart@poettering.net>2023-01-11 16:46:24 +0100
commit8112c91e484ea1a0ba0277f60a5069dd45a3b4b1 (patch)
treec3c32d0cc53f4ea57b1ff2590ee4ec6935229643 /.github
parentc9c35a3ffa492ffb21022192338ebec8ece79b47 (diff)
downloadsystemd-8112c91e484ea1a0ba0277f60a5069dd45a3b4b1.tar.gz
github: use 'meson setup'
Meson started warning when 'setup' is not used: WARNING: Running the setup command as `meson [options]` instead of `meson setup [options]` is ambiguous and deprecated. Also add more quoting in output to make the message clearer.
Diffstat (limited to '.github')
-rwxr-xr-x.github/workflows/build_test.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/build_test.sh b/.github/workflows/build_test.sh
index 0d18c6c18b..c90044c9a8 100755
--- a/.github/workflows/build_test.sh
+++ b/.github/workflows/build_test.sh
@@ -143,7 +143,8 @@ for args in "${ARGS[@]}"; do
if ! AR="$AR" \
CC="$CC" CC_LD="$LD" CFLAGS="-Werror" \
CXX="$CXX" CXX_LD="$LD" CXXFLAGS="-Werror" \
- meson -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true --werror \
+ meson setup \
+ -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true --werror \
-Dnobody-group=nogroup -Dcryptolib="${CRYPTOLIB:?}" \
$args build; then
@@ -152,7 +153,7 @@ for args in "${ARGS[@]}"; do
fi
if ! meson compile -C build -v; then
- fatal "'meson compile' failed with $args"
+ fatal "'meson compile' failed with '$args'"
fi
for loader in build/src/boot/efi/*.efi; do
@@ -163,5 +164,5 @@ for args in "${ARGS[@]}"; do
git clean -dxf
- success "Build with $args passed in $SECONDS seconds"
+ success "Build with '$args' passed in $SECONDS seconds"
done