From e4ccd74cbc80e315ec76a5a285c550c23d92f7c5 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Sat, 21 Jan 2023 12:51:27 +0000
Subject: [PATCH] ci: be explicit about the `meson setup` subcommand
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The old way of doing things is deprecated.

Signed-off-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20827>
---
 .gitlab-ci/meson/build.sh         | 3 ++-
 .gitlab-ci/windows/mesa_build.ps1 | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/meson/build.sh b/.gitlab-ci/meson/build.sh
index cc096410340..d3ce66303f1 100755
--- a/.gitlab-ci/meson/build.sh
+++ b/.gitlab-ci/meson/build.sh
@@ -59,7 +59,8 @@ case $CI_JOB_NAME in
 esac
 
 rm -rf _build
-meson _build --native-file=native.file \
+meson setup _build \
+      --native-file=native.file \
       --wrap-mode=nofallback \
       --force-fallback-for perfetto \
       ${CROSS+--cross "$CROSS_FILE"} \
diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1
index 25a6565d3d9..e79eb6b6587 100644
--- a/.gitlab-ci/windows/mesa_build.ps1
+++ b/.gitlab-ci/windows/mesa_build.ps1
@@ -36,7 +36,7 @@ $depsInstallPath="C:\mesa-deps"
 
 Push-Location $builddir
 
-meson `
+meson setup `
 --default-library=shared `
 --buildtype=release `
 --wrap-mode=nodownload `