From 4a8134975e79ccf9f52d9484428af18e83c91d69 Mon Sep 17 00:00:00 2001
From: David Heidelberg <david.heidelberg@collabora.com>
Date: Tue, 22 Nov 2022 18:56:20 +0100
Subject: [PATCH] ci/alpine: bump to 3.17, new GCC 12 and LLVM 15

Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19959>
---
 .gitlab-ci/container/alpine/x86_build.sh | 2 +-
 .gitlab-ci/container/gitlab-ci.yml       | 2 +-
 .gitlab-ci/image-tags.yml                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci/container/alpine/x86_build.sh b/.gitlab-ci/container/alpine/x86_build.sh
index c8ceaa5839986..676c11a6f6055 100644
--- a/.gitlab-ci/container/alpine/x86_build.sh
+++ b/.gitlab-ci/container/alpine/x86_build.sh
@@ -32,7 +32,7 @@ apk add \
     gettext \
     glslang \
     linux-headers \
-    llvm13-dev \
+    llvm15-dev \
     meson \
     mold \
     expat-dev \
diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index fca1ccc27e040..9db8ffa00b5ba 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -261,7 +261,7 @@ alpine/x86_build:
     - .fdo.container-build@alpine
     - .container
   variables:
-    FDO_DISTRIBUTION_VERSION: "3.16"
+    FDO_DISTRIBUTION_VERSION: "3.17"
     MESA_IMAGE_TAG: &alpine-x86_build ${ALPINE_X86_BUILD_TAG}
 
 .use-alpine/x86_build:
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 31d7a7f8469b7..61458661e0fc9 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -17,7 +17,7 @@ variables:
    DEBIAN_X86_TEST_GL_TAG: "2022-11-17-weston"
    DEBIAN_X86_TEST_VK_TAG: "2022-11-17-test-img-path"
 
-   ALPINE_X86_BUILD_TAG: "2022-11-15-alpine-bringup"
+   ALPINE_X86_BUILD_TAG: "2022-11-23-alpine-3_17"
    FEDORA_X86_BUILD_TAG: "2022-09-22-python3-ply-2"
    KERNEL_ROOTFS_TAG: "2022-11-17-weston"