ci: Add "setup" subcommand to meson call to avoid warning

Newer meson output a warning if "setup" is not provided.
Remove that warning.
Note that Windows build was not changed due to a bug in mingw-meson
script causing duplication of arguments.

Signed-off-by: Frediano Ziglio <freddy77@gmail.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 53a96aed..0c3cc33c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ before_script:
     -y
   - &protocol >
     git clone ${CI_REPOSITORY_URL/spice.git/spice-protocol.git} &&
-    meson --buildtype=release spice-protocol build-spice-protocol --prefix=/usr --werror &&
+    meson setup --buildtype=release spice-protocol build-spice-protocol --prefix=/usr --werror &&
     ninja -C build-spice-protocol install &&
     rm -rf build-spice-protocol
   # This is a workaround for Fedora docker image, this will add some
@@ -45,7 +45,7 @@ meson-makecheck:
     CFLAGS='-O2 -pipe -g -fsanitize=address -fno-omit-frame-pointer -Wframe-larger-than=40920'
     CXXFLAGS='-O2 -pipe -g -fsanitize=address -fno-omit-frame-pointer -Wframe-larger-than=40920'
     LDFLAGS='-fsanitize=address -lasan'
-    meson --buildtype=release --werror build || (cat build/meson-logs/meson-log.txt && exit 1)
+    meson setup --buildtype=release --werror build || (cat build/meson-logs/meson-log.txt && exit 1)
   - ninja -C build
   - (cd build && meson test) || (cat build/meson-logs/testlog.txt && exit 1)
 
@@ -62,7 +62,7 @@ meson-options:
   script:
   - git clean -fdx
   - git submodule foreach --recursive git clean -fdx
-  - meson --buildtype=release --werror -Dstatistics=true -Dsasl=false -Dlz4=false -Dtests=false build
+  - meson setup --buildtype=release --werror -Dstatistics=true -Dsasl=false -Dlz4=false -Dtests=false build
   - ninja -C build
   - (cd build && meson test) || (cat build/meson-logs/testlog.txt && exit 1)
 
@@ -97,7 +97,7 @@ distcheck:
   - rm -rf "$dir"
   - tar jxvf "$bz2"
   - cd "$dir"
-  - meson --buildtype=release build
+  - meson setup --buildtype=release build
   - ninja -C build
 
 # Same as makecheck job but use a Centos image
@@ -121,7 +121,7 @@ makecheck-centos:
     CFLAGS='-O2 -pipe -g -fsanitize=address -fno-omit-frame-pointer -Wframe-larger-than=40920'
     CXXFLAGS='-O2 -pipe -g -fsanitize=address -fno-omit-frame-pointer -Wframe-larger-than=40920'
     LDFLAGS='-fsanitize=address -lasan'
-    meson --buildtype=release --werror build || (cat build/meson-logs/meson-log.txt && exit 1)
+    meson setup --buildtype=release --werror build || (cat build/meson-logs/meson-log.txt && exit 1)
   - ninja -C build
   - (cd build && meson test) || (cat build/meson-logs/testlog.txt && exit 1)
 
@@ -150,7 +150,7 @@ makecheck-debian32:
     CFLAGS='-O2 -pipe -g -fsanitize=address -fno-omit-frame-pointer -Wframe-larger-than=40920'
     CXXFLAGS='-O2 -pipe -g -fsanitize=address -fno-omit-frame-pointer -Wframe-larger-than=40920'
     LDFLAGS='-fsanitize=address -lasan'
-    meson --buildtype=release --werror build || (cat build/meson-logs/meson-log.txt && exit 1)
+    meson setup --buildtype=release --werror build || (cat build/meson-logs/meson-log.txt && exit 1)
   - ninja -C build
   - (cd build && meson test) || (cat build/meson-logs/testlog.txt && exit 1)
 
@@ -201,7 +201,7 @@ websocket-autobahn:
   - git clean -fdx
   - git submodule foreach --recursive git clean -fdx
   - >
-    meson --buildtype=release build || (cat build/meson-logs/meson-log.txt && exit 1)
+    meson setup --buildtype=release build || (cat build/meson-logs/meson-log.txt && exit 1)
   - ninja -C build
   - build/server/tests/test-websocket & pid=$!
   - wstest -m fuzzingclient -s server/tests/fuzzingclient.json