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

ci/meson: reuse meson installation

Browse Source 
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29394>
This commit is contained in:
David Heidelberg
2024-05-30 12:39:11 -07:00
committed by Marge Bot
parent 24d9c066e2
commit a93932daf0
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci/container/debian/arm64_build.sh
View File

@@ -95,8 +95,7 @@ arch=armhf
. .gitlab-ci/container/build-libclc.sh
# We need at least 1.4.0 for rusticl
pip3 install --break-system-packages 'meson==1.4.0'
. .gitlab-ci/container/install-meson.sh
. .gitlab-ci/container/build-rust.sh

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

@@ -95,8 +95,7 @@ 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.4.0 for rusticl
pip3 install --break-system-packages 'meson==1.4.0'
. .gitlab-ci/container/install-meson.sh
. .gitlab-ci/container/build-rust.sh

3
.gitlab-ci/container/fedora/x86_64_build.sh
View File

@@ -101,8 +101,7 @@ 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.4.0 for rusticl
pip install meson==1.4.0
. .gitlab-ci/container/install-meson.sh
. .gitlab-ci/container/build-mold.sh

4
.gitlab-ci/container/install-meson.sh Normal file
View File

@@ -0,0 +1,4 @@
#!/usr/bin/env bash
# We need at least 1.4.0 for rusticl
pip3 install --break-system-packages 'meson==1.4.0'