harmonia
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Eric Engestrom 2023-11-20 10:15:22 +00:00 committed by Marge Bot
parent 698344b93c
commit 827bbe4829
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci/container/debian/x86_64_build-base.sh
View File

@ -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

2
.gitlab-ci/image-tags.yml
View File

@ -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"