OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci/arm_build: follow x86 and install newer Meson

Browse Source 
This allows us utilize meson env2mfile.

Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19863>
This commit is contained in:
David Heidelberg
2022-11-24 23:44:47 +01:00
committed by Marge Bot
parent 9f551e4829
commit 733498a4eb
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci/container/debian/arm_build.sh
View File

@@ -51,7 +51,7 @@ apt-get -y install \
libxshmfence-dev \ libxshmfence-dev \
libxxf86vm-dev \ libxxf86vm-dev \
llvm-11-dev \ llvm-11-dev \
meson \ ninja-build \
pkg-config \ pkg-config \
python3-mako \ python3-mako \
python3-pil \ 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 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 arch=armhf
. .gitlab-ci/container/cross_build.sh . .gitlab-ci/container/cross_build.sh