From 1966eff8a6edbc8cc62dff474f4eb39753500808 Mon Sep 17 00:00:00 2001
From: David Heidelberg <david.heidelberg@collabora.com>
Date: Wed, 24 May 2023 12:03:39 +0200
Subject: [PATCH] ci: use meson setup and meson install instead of meson and
 invoking ninja directly

Not primary scope of relevant MR, just some incremental changes.

Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21977>
---
 .gitlab-ci/container/build-crosvm.sh         |  4 ++--
 .gitlab-ci/container/build-libdrm.sh         |  6 +++---
 .gitlab-ci/container/build-wayland.sh        | 10 +++++-----
 .gitlab-ci/container/debian/android_build.sh |  4 ++--
 .gitlab-ci/container/debian/x86_build.sh     |  8 +++-----
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh
index 0f7c266a080..486cb6f1e03 100644
--- a/.gitlab-ci/container/build-crosvm.sh
+++ b/.gitlab-ci/container/build-crosvm.sh
@@ -17,8 +17,8 @@ rm -rf third_party/virglrenderer
 git clone --single-branch -b master --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer
 pushd third_party/virglrenderer
 git checkout "$VIRGLRENDERER_VERSION"
-meson build/ -Drender-server-worker=process -Dvenus=true $EXTRA_MESON_ARGS
-ninja -C build install
+meson setup build/ -Drender-server-worker=process -Dvenus=true $EXTRA_MESON_ARGS
+meson install -C build
 popd
 
 RUSTFLAGS='-L native=/usr/local/lib' cargo install \
diff --git a/.gitlab-ci/container/build-libdrm.sh b/.gitlab-ci/container/build-libdrm.sh
index 9297d8becd3..0d691f4fe86 100644
--- a/.gitlab-ci/container/build-libdrm.sh
+++ b/.gitlab-ci/container/build-libdrm.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting
 
 set -ex
@@ -9,7 +9,7 @@ curl -L -O --retry 4 -f --retry-all-errors --retry-delay 60 \
     https://dri.freedesktop.org/libdrm/"$LIBDRM_VERSION".tar.xz
 tar -xvf "$LIBDRM_VERSION".tar.xz && rm "$LIBDRM_VERSION".tar.xz
 cd "$LIBDRM_VERSION"
-meson build -D vc4=false -D freedreno=false -D etnaviv=false $EXTRA_MESON_ARGS
-ninja -C build install
+meson setup build -D vc4=false -D freedreno=false -D etnaviv=false $EXTRA_MESON_ARGS
+meson install -C build
 cd ..
 rm -rf "$LIBDRM_VERSION"
diff --git a/.gitlab-ci/container/build-wayland.sh b/.gitlab-ci/container/build-wayland.sh
index e296ac32b5d..e04b28c4833 100644
--- a/.gitlab-ci/container/build-wayland.sh
+++ b/.gitlab-ci/container/build-wayland.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting
 
 set -ex
@@ -9,15 +9,15 @@ export WAYLAND_PROTOCOLS_VERSION="1.24"
 git clone https://gitlab.freedesktop.org/wayland/wayland
 cd wayland
 git checkout "$LIBWAYLAND_VERSION"
-meson -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true _build $EXTRA_MESON_ARGS
-ninja -C _build install
+meson setup -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true _build $EXTRA_MESON_ARGS
+meson install -C _build
 cd ..
 rm -rf wayland
 
 git clone https://gitlab.freedesktop.org/wayland/wayland-protocols
 cd wayland-protocols
 git checkout "$WAYLAND_PROTOCOLS_VERSION"
-meson _build $EXTRA_MESON_ARGS
-ninja -C _build install
+meson setup _build $EXTRA_MESON_ARGS
+meson install -C _build
 cd ..
 rm -rf wayland-protocols
diff --git a/.gitlab-ci/container/debian/android_build.sh b/.gitlab-ci/container/debian/android_build.sh
index facc77db18d..191c56fcbe1 100644
--- a/.gitlab-ci/container/debian/android_build.sh
+++ b/.gitlab-ci/container/debian/android_build.sh
@@ -45,7 +45,7 @@ for arch in \
 
     cd $LIBDRM_VERSION
     rm -rf build-$arch
-    meson build-$arch \
+    meson setup build-$arch \
           --cross-file=/cross_file-$arch.txt \
           --libdir=lib/$arch \
           -Dlibkms=false \
@@ -56,7 +56,7 @@ for arch in \
           -Dintel=false \
           -Dcairo-tests=false \
           -Dvalgrind=false
-    ninja -C build-$arch install
+    meson install -C build-$arch
     cd ..
 done
 
diff --git a/.gitlab-ci/container/debian/x86_build.sh b/.gitlab-ci/container/debian/x86_build.sh
index d1113ec3c62..932b6a4ea5b 100644
--- a/.gitlab-ci/container/debian/x86_build.sh
+++ b/.gitlab-ci/container/debian/x86_build.sh
@@ -84,11 +84,9 @@ make
 popd
 
 git clone https://github.com/microsoft/DirectX-Headers -b v1.610.0 --depth 1
-mkdir -p DirectX-Headers/build
-pushd DirectX-Headers/build
-meson .. --backend=ninja --buildtype=release -Dbuild-test=false
-ninja
-ninja install
+pushd DirectX-Headers
+meson setup build --backend=ninja --buildtype=release -Dbuild-test=false
+meson install -C build
 popd
 rm -rf DirectX-Headers