Module: Mesa Branch: main Commit: 6f0fcb0a0cf004c41ae3e86e86f44d73200823d8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6f0fcb0a0cf004c41ae3e86e86f44d73200823d8
Author: David Heidelberg <[email protected]> Date: Sat Feb 25 18:15:07 2023 +0100 ci/alpine: keep the curl inside the image Signed-off-by: David Heidelberg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20272> --- .gitlab-ci/container/alpine/x86_build.sh | 2 +- .gitlab-ci/image-tags.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/container/alpine/x86_build.sh b/.gitlab-ci/container/alpine/x86_build.sh index 762bc988d84..a99a4fde61c 100644 --- a/.gitlab-ci/container/alpine/x86_build.sh +++ b/.gitlab-ci/container/alpine/x86_build.sh @@ -10,7 +10,6 @@ EPHEMERAL=" automake bzip2 cmake - curl git libtool libepoxy-dev @@ -26,6 +25,7 @@ apk add \ bison \ ccache \ clang-dev \ + curl \ flex \ gcc \ g++ \ diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 7fdd31b2b78..b6a6ed7a827 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -19,7 +19,7 @@ variables: DEBIAN_X86_TEST_GL_TAG: "2023-02-17-deqp-build" DEBIAN_X86_TEST_VK_TAG: "2023-02-20-uprev-vkd3d-proton" - ALPINE_X86_BUILD_TAG: "2023-01-20-all-in-1" + ALPINE_X86_BUILD_TAG: "2023-02-25-keep-the-curl" FEDORA_X86_BUILD_TAG: "2023-02-09-f36" KERNEL_ROOTFS_TAG: "2023-02-23-virglrenderer"
