Module: Mesa Branch: main Commit: d72544eea6bb1daf70d529f4948c5fc23e1c0fee URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d72544eea6bb1daf70d529f4948c5fc23e1c0fee
Author: Karol Herbst <kher...@redhat.com> Date: Fri Jan 5 02:20:53 2024 +0100 ci,rusticl: bump meson req to 1.3.1 See https://github.com/mesonbuild/meson/pull/12620 Signed-off-by: Karol Herbst <kher...@redhat.com> Reviewed-by: Eric Engestrom <e...@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24386> --- .gitlab-ci/container/debian/x86_64_build-base.sh | 4 ++-- .gitlab-ci/container/fedora/x86_64_build.sh | 4 ++-- .gitlab-ci/image-tags.yml | 4 ++-- docs/rusticl.rst | 2 +- meson.build | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci/container/debian/x86_64_build-base.sh b/.gitlab-ci/container/debian/x86_64_build-base.sh index 7ca177adfaa..2cbc30704e2 100644 --- a/.gitlab-ci/container/debian/x86_64_build-base.sh +++ b/.gitlab-ci/container/debian/x86_64_build-base.sh @@ -85,8 +85,8 @@ apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \ # Needed for ci-fairy, this revision is able to upload files to S3 pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 -# We need at least 1.3 for stable Rust support -pip3 install --break-system-packages 'meson==1.3.0' +# We need at least 1.3.1 for rusticl +pip3 install --break-system-packages 'meson==1.3.1' . .gitlab-ci/container/build-rust.sh diff --git a/.gitlab-ci/container/fedora/x86_64_build.sh b/.gitlab-ci/container/fedora/x86_64_build.sh index 38ef6be6dc2..72c0235e4d7 100644 --- a/.gitlab-ci/container/fedora/x86_64_build.sh +++ b/.gitlab-ci/container/fedora/x86_64_build.sh @@ -96,8 +96,8 @@ tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2 cd $XORGMACROS_VERSION; ./configure; make install; cd .. rm -rf $XORGMACROS_VERSION -# We need at least 1.3 for meson's rust.proc_macro -pip install meson==1.3.0 +# We need at least 1.3.1 for rusticl +pip install meson==1.3.1 . .gitlab-ci/container/build-mold.sh diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index ad19f0d549a..91cf83b4634 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -7,7 +7,7 @@ variables: DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" - DEBIAN_BASE_TAG: "2023-11-18-deqp-runner" + DEBIAN_BASE_TAG: "2024-01-05-meson-bump" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" DEBIAN_BUILD_TAG: "2023-12-27-libdrm" @@ -24,7 +24,7 @@ variables: ALPINE_X86_64_BUILD_TAG: "2023-10-30-ci-improv" ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version" - FEDORA_X86_64_BUILD_TAG: "2023-12-11-meson-bump" + FEDORA_X86_64_BUILD_TAG: "2024-01-05-meson-bump" KERNEL_ROOTFS_TAG: "2023-12-22-vkcts" KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb" KERNEL_REPO: "gfx-ci/linux" diff --git a/docs/rusticl.rst b/docs/rusticl.rst index 213f24334b3..aca6b4e62ab 100644 --- a/docs/rusticl.rst +++ b/docs/rusticl.rst @@ -30,7 +30,7 @@ To build Rusticl you need to satisfy the following build dependencies: The minimum versions to build Rusticl are: - Rust: 1.66 -- Meson: 1.3.0 +- Meson: 1.3.1 - Bindgen: 0.62.0 - LLVM: 11.0.0 (recommended: 15.0.0) - Clang: 11.0.0 (recommended: 15.0.0) diff --git a/meson.build b/meson.build index b2cd74e491d..6bbe203b5a4 100644 --- a/meson.build +++ b/meson.build @@ -813,8 +813,8 @@ if with_gallium_rusticl error('rusticl requires at least one gallium driver.') endif - if meson.version().version_compare('< 1.3') - error('rusticl requires meson 1.3.0 or newer') + if meson.version().version_compare('< 1.3.1') + error('rusticl requires meson 1.3.1 or newer') endif add_languages('rust', required: true)
