From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 11 Jan 2023 14:04:11 +0000 (+0100)
Subject: github: use 'meson setup'
X-Git-Tag: v253-rc1~130
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8112c91e484ea1a0ba0277f60a5069dd45a3b4b1;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/.github/workflows/build_test.sh b/.github/workflows/build_test.sh
index 0d18c6c18be..c90044c9a85 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