Module: Mesa Branch: main Commit: 733498a4ebac0d026b4a3fe4426340705a174b0f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=733498a4ebac0d026b4a3fe4426340705a174b0f
Author: David Heidelberg <[email protected]> Date: Thu Nov 24 23:44:47 2022 +0100 ci/arm_build: follow x86 and install newer Meson This allows us utilize meson env2mfile. Signed-off-by: David Heidelberg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19863> --- .gitlab-ci/container/debian/arm_build.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/container/debian/arm_build.sh b/.gitlab-ci/container/debian/arm_build.sh index 3ee9dea8ba9..14bb6c2ee8e 100644 --- a/.gitlab-ci/container/debian/arm_build.sh +++ b/.gitlab-ci/container/debian/arm_build.sh @@ -51,7 +51,7 @@ apt-get -y install \ libxshmfence-dev \ libxxf86vm-dev \ llvm-11-dev \ - meson \ + ninja-build \ pkg-config \ python3-mako \ python3-pil \ @@ -70,6 +70,9 @@ apt-get install -y --no-remove -t buster \ pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 +# We need at least 0.61.4 for proper Rust; 0.62 for modern meson env2mfile +pip3 install meson==0.63.3 + arch=armhf . .gitlab-ci/container/cross_build.sh
