From 4d38890c9e7b6c5aba750fe13d25d1bcb9b0a6f4 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 16 Feb 2022 12:32:13 +0100 Subject: [PATCH] ci: upgrade to libdrm 2.4.110 Signed-off-by: Samuel Pitoiset Reviewed-by: Pierre-Eric Pelloux-Prayer Reviewed-by: Bas Nieuwenhuizen Part-of: --- .gitlab-ci/container/build-libdrm.sh | 2 +- .gitlab-ci/container/debian/android_build.sh | 2 +- .gitlab-ci/image-tags.yml | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci/container/build-libdrm.sh b/.gitlab-ci/container/build-libdrm.sh index c55d3646f4a..65bd7768ad9 100644 --- a/.gitlab-ci/container/build-libdrm.sh +++ b/.gitlab-ci/container/build-libdrm.sh @@ -2,7 +2,7 @@ set -ex -export LIBDRM_VERSION=libdrm-2.4.109 +export LIBDRM_VERSION=libdrm-2.4.110 wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.xz tar -xvf $LIBDRM_VERSION.tar.xz && rm $LIBDRM_VERSION.tar.xz diff --git a/.gitlab-ci/container/debian/android_build.sh b/.gitlab-ci/container/debian/android_build.sh index 58fc1e4c1e7..121976f1b73 100644 --- a/.gitlab-ci/container/debian/android_build.sh +++ b/.gitlab-ci/container/debian/android_build.sh @@ -30,7 +30,7 @@ sh .gitlab-ci/container/create-android-cross-file.sh /$ndk arm-linux-androideabi # Not using build-libdrm.sh because we don't want its cleanup after building # each arch. Fetch and extract now. -export LIBDRM_VERSION=libdrm-2.4.109 +export LIBDRM_VERSION=libdrm-2.4.110 wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.xz tar -xf $LIBDRM_VERSION.tar.xz && rm $LIBDRM_VERSION.tar.xz diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 7bea3be8522..96d02846620 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -1,18 +1,18 @@ variables: DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base" - DEBIAN_BASE_TAG: "2022-02-06-deqp-runner" + DEBIAN_BASE_TAG: "2022-02-21-libdrm" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" - DEBIAN_BUILD_TAG: "2021-02-15-pytest" + DEBIAN_BUILD_TAG: "2022-02-21-libdrm" DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base" DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl" - DEBIAN_X86_TEST_GL_TAG: "2022-02-17-vsock" - DEBIAN_X86_TEST_VK_TAG: "2022-02-06-deqp" + DEBIAN_X86_TEST_GL_TAG: "2022-02-21-libdrm" + DEBIAN_X86_TEST_VK_TAG: "2022-02-21-libdrm" - FEDORA_X86_BUILD_TAG: "2021-12-31-refactor" - KERNEL_ROOTFS_TAG: "2022-02-17-vsock" + FEDORA_X86_BUILD_TAG: "2022-02-21-libdrm" + KERNEL_ROOTFS_TAG: "2022-02-21-libdrm" WINDOWS_X64_BUILD_PATH: "windows/x64_build" WINDOWS_X64_BUILD_TAG: "2022-20-02-base_split"