From 7d0630d763c7a24f5e902912e9061a8b02e367a3 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Tue, 26 Dec 2023 02:28:48 +0100 Subject: [PATCH] ci/alpine: update to latest to get libdrm 2.4.119 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Eric Engestrom Reviewed-by: Marek Olšák Signed-off-by: David Heidelberg Part-of: --- .gitlab-ci/container/gitlab-ci.yml | 3 ++- .gitlab-ci/image-tags.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index dabf7875938..041fa273741 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -259,7 +259,8 @@ debian/arm64_build: - .fdo.container-build@alpine - .container variables: - FDO_DISTRIBUTION_VERSION: "3.18" + FDO_DISTRIBUTION_VERSION: "edge" # switch to 3.20 when gets released + FDO_BASE_IMAGE: alpine:$FDO_DISTRIBUTION_VERSION # since cbuild ignores it # Alpine based x86_64 build image alpine/x86_64_build: diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 1a803a0832d..e0c7777de46 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -22,7 +22,7 @@ variables: DEBIAN_X86_64_TEST_GL_TAG: "2023-12-22-vkcts" DEBIAN_X86_64_TEST_VK_TAG: "2023-12-22-vkcts" - ALPINE_X86_64_BUILD_TAG: "2023-10-30-ci-improv" + ALPINE_X86_64_BUILD_TAG: "2023-01-07-libdrm2_4_119" ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version" FEDORA_X86_64_BUILD_TAG: "2024-01-05-meson-bump" KERNEL_ROOTFS_TAG: "2024-01-06-libdrm"