From 2d3ab674ee02cfe8d0cb05814f3156d277f2d660 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Wed, 4 Oct 2023 13:15:07 +0100 Subject: [PATCH] ci: drop unused ephemeral packages in alpine image There's nothing between installing these packages and removing them that uses them, so let's just drop them. Part-of: --- .gitlab-ci/container/alpine/x86_64_build.sh | 9 --------- .gitlab-ci/image-tags.yml | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.gitlab-ci/container/alpine/x86_64_build.sh b/.gitlab-ci/container/alpine/x86_64_build.sh index 3bca61a858e..eb7470d5722 100644 --- a/.gitlab-ci/container/alpine/x86_64_build.sh +++ b/.gitlab-ci/container/alpine/x86_64_build.sh @@ -9,15 +9,6 @@ set -e set -o xtrace EPHEMERAL=( - autoconf - automake - bzip2 - libtool - libepoxy-dev - libtbb-dev - make - openssl-dev - unzip ) diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index d6bbd74ceae..fe3ffa70270 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -25,7 +25,7 @@ variables: DEBIAN_X86_64_TEST_GL_TAG: "2023-09-18-deqp" DEBIAN_X86_64_TEST_VK_TAG: "2023-09-18-deqp" - ALPINE_X86_64_BUILD_TAG: "2023-08-04-shader-db" + ALPINE_X86_64_BUILD_TAG: "2023-10-04-ephemeral" ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version" FEDORA_X86_64_BUILD_TAG: "2023-08-04-shader-db" KERNEL_ROOTFS_TAG: "2023-09-18-deqp"