From b382d2eba89f233b33612b21ff6cb9cf7d308797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Thu, 9 Mar 2023 23:32:53 +0100
Subject: [PATCH] ci: do not omit "setup" from the meson command

meson prints the following warning:

  WARNING: Running the setup command as `meson [options]` instead
           of `meson setup [options]` is ambiguous and deprecated.
---
 .gitlab-ci.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 88ed826c8..1cfd0d012 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -177,7 +177,7 @@ include:
       fi
   script:
     - echo "Building with meson options $MESON_OPTIONS"
-    - meson "$BUILD_DIR" . --prefix="$PREFIX" $MESON_OPTIONS
+    - meson setup "$BUILD_DIR" --prefix="$PREFIX" $MESON_OPTIONS
     - ninja $NINJA_ARGS -C "$BUILD_DIR"
     - ninja $NINJA_ARGS -C "$BUILD_DIR" test
     - ninja $NINJA_ARGS -C "$BUILD_DIR" install
@@ -312,7 +312,7 @@ build_with_custom_options:
         MESON_OPTION_VALUE: [enabled, disabled]
   script:
     - echo "Building with -D$MESON_OPTION=$MESON_OPTION_VALUE"
-    - meson "$BUILD_DIR" . --prefix="$PREFIX" "-D$MESON_OPTION=$MESON_OPTION_VALUE" -Dsession-managers=[]
+    - meson setup "$BUILD_DIR" --prefix="$PREFIX" "-D$MESON_OPTION=$MESON_OPTION_VALUE" -Dsession-managers=[]
     - ninja $NINJA_ARGS -C "$BUILD_DIR"
     - ninja $NINJA_ARGS -C "$BUILD_DIR" test
 
@@ -333,7 +333,7 @@ build_session_managers:
     - .build_on_fedora
   script:
     - echo "Building with meson options $MESON_OPTIONS"
-    - meson "$BUILD_DIR" . --prefix="$PREFIX" $MESON_OPTIONS
+    - meson setup "$BUILD_DIR" --prefix="$PREFIX" $MESON_OPTIONS
     - ninja $NINJA_ARGS -C "$BUILD_DIR"
     - ninja $NINJA_ARGS -C "$BUILD_DIR" install
   variables:
@@ -349,7 +349,7 @@ build_meson_prerelease:
   script:
     - pip3 install --upgrade --pre meson
     - echo "Building with meson options $MESON_OPTIONS"
-    - meson "$BUILD_DIR" . --prefix="$PREFIX" $MESON_OPTIONS
+    - meson setup "$BUILD_DIR" --prefix="$PREFIX" $MESON_OPTIONS
     - ninja $NINJA_ARGS -C "$BUILD_DIR"
     - ninja $NINJA_ARGS -C "$BUILD_DIR" install
   variables:
@@ -366,7 +366,7 @@ build_meson_exact_release:
     - pip3 uninstall --yes meson
     - pip3 install "meson==$meson_version"
     - echo "Building with meson options $MESON_OPTIONS"
-    - meson "$BUILD_DIR" . --prefix="$PREFIX" $MESON_OPTIONS
+    - meson setup "$BUILD_DIR" --prefix="$PREFIX" $MESON_OPTIONS
     - ninja $NINJA_ARGS -C "$BUILD_DIR"
     - ninja $NINJA_ARGS -C "$BUILD_DIR" install
   variables:
@@ -377,7 +377,7 @@ valgrind:
     - .build_on_fedora
   script:
     - echo "Building with meson options $MESON_OPTIONS"
-    - meson "$BUILD_DIR" . --prefix="$PREFIX" $MESON_OPTIONS
+    - meson setup "$BUILD_DIR" --prefix="$PREFIX" $MESON_OPTIONS
     - meson test -C "$BUILD_DIR" --setup=valgrind
   variables:
     MESON_OPTIONS: "-Dsession-managers=[]"
@@ -391,7 +391,7 @@ build_with_coverity:
   stage: analysis
   script:
     - export PATH=/opt/coverity/bin:$PATH
-    - meson "$BUILD_DIR" . --prefix="$PREFIX"
+    - meson setup "$BUILD_DIR" --prefix="$PREFIX"
         -Ddocs=disabled
         -Dbluez5-backend-hsphfpd=enabled
         -Daudiotestsrc=enabled