From 8a4e530f9ddcf2b16973bdfa41da4953e7fe4e94 Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Mon, 10 Jun 2024 09:24:15 +0200 Subject: [PATCH] ci: uprev mold to 2.32.0 Also update tag list in build-mold.sh. Signed-off-by: Christian Gmeiner Reviewed-by: David Heidelberg Reviewed-by: Eric Engestrom Part-of: --- .gitlab-ci/container/build-mold.sh | 3 ++- .gitlab-ci/image-tags.yml | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci/container/build-mold.sh b/.gitlab-ci/container/build-mold.sh index b97b5c2764f..f5f50d0a4f5 100644 --- a/.gitlab-ci/container/build-mold.sh +++ b/.gitlab-ci/container/build-mold.sh @@ -4,12 +4,13 @@ set -ex # When changing this file, you need to bump the following # .gitlab-ci/image-tags.yml tags: +# ALPINE_X86_64_BUILD_TAG # DEBIAN_BASE_TAG # DEBIAN_BUILD_TAG # FEDORA_X86_64_BUILD_TAG # KERNEL_ROOTFS_TAG -MOLD_VERSION="2.31.0" +MOLD_VERSION="2.32.0" git clone -b v"$MOLD_VERSION" --single-branch --depth 1 https://github.com/rui314/mold.git pushd mold diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 4fe146aa3b1..28bb08b092c 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -13,10 +13,10 @@ variables: DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" - DEBIAN_BASE_TAG: "20240529-rust" + DEBIAN_BASE_TAG: "20240612-mold" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" - DEBIAN_BUILD_TAG: "20240611-meson" + DEBIAN_BUILD_TAG: "20240612-mold" DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base" DEBIAN_ARM64_TEST_BASE_IMAGE: "debian/arm64_test-base" @@ -30,11 +30,11 @@ variables: DEBIAN_TEST_ANDROID_TAG: "20240423-deqp" DEBIAN_TEST_GL_TAG: "20240531-glcts" DEBIAN_TEST_VK_TAG: "20240531-piglit-cf" - KERNEL_ROOTFS_TAG: "20240531-glcts" + KERNEL_ROOTFS_TAG: "20240612-mold" - ALPINE_X86_64_BUILD_TAG: "20240517-m0ld" + ALPINE_X86_64_BUILD_TAG: "20240612-mold" ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto" - FEDORA_X86_64_BUILD_TAG: "20240611-meson" + FEDORA_X86_64_BUILD_TAG: "20240612-mold" KERNEL_TAG: "v6.6.21-mesa-f8ea" KERNEL_REPO: "gfx-ci/linux" PKG_REPO_REV: "3cc12a2a"