[PATCH] gitlab-ci: correct meson setup commands

[Kamil Konieczny]

Hi Andrzej,
On 2025-06-13 at 16:30:49 +0200, Andrzej Hajda wrote:
> Newer meson does not like setup phase without setup argument and complains:
> WARNING: Running the setup command as `meson [options]` instead of `meson setup [options]` is ambiguous and deprecated.
> 
> Signed-off-by: Andrzej Hajda <andrzej.hajda at intel.com>

Reviewed-by: Kamil Konieczny <kamil.konieczny at linux.intel.com>

> ---
>  .gitlab-ci.yml | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 519edab5ff9c79eae0de71e71e3f3645431a1459..587bf884708b315b3c015fec9467f7993bd56417 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -74,7 +74,7 @@ build-containers:build-fedora:
>  build:tests-fedora:
>    stage: build
>    script:
> -    - meson --prefix=/opt/igt $MESON_OPTIONS build
> +    - meson setup --prefix=/opt/igt $MESON_OPTIONS build
>      - ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1
>      - DESTDIR="$PWD/installdir" ninja -C build install
>      - ninja -C build -j${FDO_CI_CONCURRENT:-4} igt-gpu-tools-doc
> @@ -87,7 +87,7 @@ build:tests-fedora-no-libunwind:
>    stage: build
>    script:
>      - dnf remove -y libunwind-devel
> -    - meson -Dlibunwind=disabled build
> +    - meson setup -Dlibunwind=disabled build
>      - ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1
>  
>  # documentation building is different with meson<0.47
> @@ -96,7 +96,7 @@ build:tests-fedora-oldest-meson:
>    script:
>      - dnf remove -y meson
>      - pip install /usr/src/meson-*.tar.gz
> -    - meson $MESON_OPTIONS build
> +    - meson setup $MESON_OPTIONS build
>      - ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1
>      - ninja -C build -j${FDO_CI_CONCURRENT:-4} igt-gpu-tools-doc
>  
> @@ -104,7 +104,7 @@ build:tests-fedora-oldest-meson:
>  build:tests-fedora-no-libdrm-nouveau:
>    stage: build
>    script:
> -    - meson -Dlibdrm_drivers= build
> +    - meson setup -Dlibdrm_drivers= build
>      - ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1
>  
>  build:tests-fedora-clang:
> @@ -112,7 +112,7 @@ build:tests-fedora-clang:
>    variables:
>      CC: clang
>    script:
> -    - meson $MESON_OPTIONS build
> +    - meson setup $MESON_OPTIONS build
>      - ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1
>    artifacts:
>      paths:
> @@ -122,7 +122,7 @@ build:tests-debian-meson:
>    image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian:commit-$CI_COMMIT_SHA
>    stage: build
>    script:
> -    - meson $MESON_OPTIONS build
> +    - meson setup $MESON_OPTIONS build
>      - ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1
>      - cp build/tests/test-list.txt meson-test-list.txt
>    artifacts:
> @@ -133,7 +133,7 @@ build:tests-debian-minimal:
>    image: $CI_REGISTRY/$CI_PROJECT_PATH/build-debian-minimal:commit-$CI_COMMIT_SHA
>    stage: build
>    script:
> -    - meson -Dtests=disabled -Dlibdrm_drivers="" build
> +    - meson setup -Dtests=disabled -Dlibdrm_drivers="" build
>      - ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1
>    artifacts:
>      paths:
> @@ -144,7 +144,7 @@ build:tests-debian-meson-armhf:
>    stage: build
>    script:
>      - export PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig/
> -    - meson --cross-file meson-cross-armhf.txt build
> +    - meson setup --cross-file meson-cross-armhf.txt build
>      - ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1
>    artifacts:
>      paths:
> @@ -155,7 +155,7 @@ build:tests-debian-meson-arm64:
>    stage: build
>    script:
>      - export PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig/
> -    - meson --cross-file meson-cross-arm64.txt build
> +    - meson setup --cross-file meson-cross-arm64.txt build
>      - ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1
>    artifacts:
>      paths:
> 
> ---
> base-commit: d5b5d2bb4f8795a98ea58376a128b74f654b7ec1
> change-id: 20250613-meson_setup-d8c895cfe3ac
> 
> Best regards,
> -- 
> Andrzej Hajda <andrzej.hajda at intel.com>
>