From 87439ffed1ea1904c808343a96df1f049b0d0124 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Tue, 2 Jul 2024 14:18:55 +0200 Subject: [PATCH] ci: bump Fedora and Android libdrm2 to 2.4.122 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Acked-by: Samuel Pitoiset Acked-by: Corentin Noël Part-of: --- .gitlab-ci/container/build-libdrm.sh | 5 +++-- .gitlab-ci/image-tags.yml | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/container/build-libdrm.sh b/.gitlab-ci/container/build-libdrm.sh index 0293b598abf..3f8f23e3f53 100644 --- a/.gitlab-ci/container/build-libdrm.sh +++ b/.gitlab-ci/container/build-libdrm.sh @@ -1,10 +1,11 @@ #!/usr/bin/env bash -# Script used for Android and Fedora builds +# Script used for Android and Fedora builds (Debian builds get their libdrm version +# from https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo - see PKG_REPO_REV) # shellcheck disable=SC2086 # we want word splitting set -ex -export LIBDRM_VERSION=libdrm-2.4.119 +export LIBDRM_VERSION=libdrm-2.4.122 curl -L -O --retry 4 -f --retry-all-errors --retry-delay 60 \ https://dri.freedesktop.org/libdrm/"$LIBDRM_VERSION".tar.xz diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index bee536329cc..d82d5773677 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -16,7 +16,7 @@ variables: DEBIAN_BASE_TAG: "20240704-libdir" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" - DEBIAN_BUILD_TAG: "20240704-libdir" + DEBIAN_BUILD_TAG: "20240704-libdrm" DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base" DEBIAN_ARM64_TEST_BASE_IMAGE: "debian/arm64_test-base" @@ -34,10 +34,10 @@ variables: ALPINE_X86_64_BUILD_TAG: "20240620-sphinx" ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto" - FEDORA_X86_64_BUILD_TAG: "20240612-mold" + FEDORA_X86_64_BUILD_TAG: "20240704-libdrm" KERNEL_TAG: "v6.6.21-mesa-f8ea" KERNEL_REPO: "gfx-ci/linux" - PKG_REPO_REV: "3cc12a2a" + PKG_REPO_REV: "bca9635d" WINDOWS_X64_MSVC_PATH: "windows/x86_64_msvc" WINDOWS_X64_MSVC_TAG: "20231222-msvc"