Module: Mesa Branch: main Commit: 827bbe48298b7e32d46c1b9b777511109762f305 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=827bbe48298b7e32d46c1b9b777511109762f305
Author: Eric Engestrom <e...@igalia.com> Date: Mon Nov 20 10:15:22 2023 +0000 ci: use released version of meson This was needed before 1.3.0 was released, but now we can use 1.3.0 :) Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26289> --- .gitlab-ci/container/debian/x86_64_build-base.sh | 6 +++++- .gitlab-ci/image-tags.yml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/container/debian/x86_64_build-base.sh b/.gitlab-ci/container/debian/x86_64_build-base.sh index c53bf1f0a1e..7ca177adfaa 100644 --- a/.gitlab-ci/container/debian/x86_64_build-base.sh +++ b/.gitlab-ci/container/debian/x86_64_build-base.sh @@ -1,6 +1,10 @@ #!/usr/bin/env bash # shellcheck disable=SC2086 # we want word splitting +# When changing this file, you need to bump the following +# .gitlab-ci/image-tags.yml tags: +# DEBIAN_BUILD_TAG + set -e set -o xtrace @@ -82,7 +86,7 @@ apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \ 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 @ git+https://github.com/mesonbuild/meson.git@cddf2e9d872ebbc673d2595bc176a0572d258222' +pip3 install --break-system-packages 'meson==1.3.0' . .gitlab-ci/container/build-rust.sh diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index a5ec9055337..07eaa5c5521 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -10,7 +10,7 @@ variables: DEBIAN_BASE_TAG: "2023-11-18-deqp-runner" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" - DEBIAN_BUILD_TAG: "2023-10-30-ci-improv" + DEBIAN_BUILD_TAG: "2023-11-20-meson" DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
