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

ci/fedora: bump to meson 1.3.0

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26636>
This commit is contained in:
Karol Herbst
2023-12-11 13:57:18 +01:00
committed by Marge Bot
parent 1188b218c6
commit 2d80240220
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,8 +96,8 @@ tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
cd $XORGMACROS_VERSION; ./configure; make install; cd .. cd $XORGMACROS_VERSION; ./configure; make install; cd ..
rm -rf $XORGMACROS_VERSION rm -rf $XORGMACROS_VERSION
# We need at least 1.2 for Rust's `debug_assertions` # We need at least 1.3 for meson's rust.proc_macro
pip install meson==1.2.0 pip install meson==1.3.0
. .gitlab-ci/container/build-mold.sh . .gitlab-ci/container/build-mold.sh

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

@@ -24,7 +24,7 @@ variables:
ALPINE_X86_64_BUILD_TAG: "2023-10-30-ci-improv" ALPINE_X86_64_BUILD_TAG: "2023-10-30-ci-improv"
ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version" ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version"
FEDORA_X86_64_BUILD_TAG: "2023-10-30-ci-improv" FEDORA_X86_64_BUILD_TAG: "2023-12-11-meson-bump"
KERNEL_ROOTFS_TAG: "2023-12-08-firmware" KERNEL_ROOTFS_TAG: "2023-12-08-firmware"
KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb" KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb"
KERNEL_REPO: "gfx-ci/linux" KERNEL_REPO: "gfx-ci/linux"