From bc21c2863e41c3426eb92ad16ed35e3b21eef30c Mon Sep 17 00:00:00 2001
From: David Heidelberg <david.heidelberg@collabora.com>
Date: Thu, 1 Jun 2023 10:47:43 +0200
Subject: [PATCH] ci: bump Alpine to 3.18

Update LLVM to 16.

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

diff --git a/.gitlab-ci/container/alpine/x86_build.sh b/.gitlab-ci/container/alpine/x86_build.sh
index f7c91d32034..cd643eb864e 100644
--- a/.gitlab-ci/container/alpine/x86_build.sh
+++ b/.gitlab-ci/container/alpine/x86_build.sh
@@ -1,62 +1,59 @@
-#!/bin/bash
-# shellcheck disable=SC2086 # we want word splitting
-
+#!/usr/bin/env bash
+# shellcheck disable=SC1091
 set -e
 set -o xtrace
 
+EPHEMERAL=(
+    autoconf
+    automake
+    bzip2
+    libtool
+    libepoxy-dev
+    libtbb-dev
+    make
+    openssl-dev
+    unzip
+)
 
-EPHEMERAL="
-        autoconf
-        automake
-        bzip2
-        cmake
-        git
-        libtool
-        libepoxy-dev
-        libtbb-dev
-        make
-        openssl-dev
-        unzip
-        xz
-	zstd-dev
-        "
 
-apk add \
-    bash \
-    bison \
-    ccache \
-    clang-dev \
-    coreutils \
-    curl \
-    flex \
-    gcc \
-    g++ \
-    gettext \
-    glslang \
-    linux-headers \
-    llvm15-dev \
-    meson \
-    expat-dev \
-    elfutils-dev \
-    libselinux-dev \
-    libva-dev \
-    libpciaccess-dev \
-    zlib-dev \
-    python3-dev \
-    py3-mako \
-    py3-ply \
-    vulkan-headers \
-    spirv-tools-dev \
-    util-macros \
-    $EPHEMERAL
+DEPS=(
+    bash
+    bison
+    ccache
+    cmake
+    clang-dev
+    coreutils
+    curl
+    flex
+    gcc
+    g++
+    git
+    gettext
+    glslang
+    linux-headers
+    llvm16-dev
+    meson
+    expat-dev
+    elfutils-dev
+    libdrm-dev
+    libselinux-dev
+    libva-dev
+    libpciaccess-dev
+    zlib-dev
+    python3-dev
+    py3-mako
+    py3-ply
+    vulkan-headers
+    spirv-tools-dev
+    util-macros
+    wayland-dev
+    wayland-protocols
+)
 
+apk add "${DEPS[@]}" "${EPHEMERAL[@]}"
 
 . .gitlab-ci/container/container_pre_build.sh
 
-. .gitlab-ci/container/build-libdrm.sh
-
-. .gitlab-ci/container/build-wayland.sh
-
 pushd /usr/local
 git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
 rm -rf shader-db/.git
@@ -67,6 +64,6 @@ popd
 
 ############### Uninstall the build software
 
-apk del $EPHEMERAL
+apk del "${EPHEMERAL[@]}"
 
 . .gitlab-ci/container/container_post_build.sh
diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index 9e2a1df266d..016ca6ceccc 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -281,7 +281,7 @@ alpine/x86_build:
     - .fdo.container-build@alpine
     - .container
   variables:
-    FDO_DISTRIBUTION_VERSION: "3.17"
+    FDO_DISTRIBUTION_VERSION: "3.18"
     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 2bd7cb31e47..d89ff352d85 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -19,7 +19,7 @@ variables:
    DEBIAN_X86_TEST_GL_TAG: "2023-05-31-vvl"
    DEBIAN_X86_TEST_VK_TAG: "2023-05-25-vkd3d-proton"
 
-   ALPINE_X86_BUILD_TAG: "2023-03-20-3.17-bump"
+   ALPINE_X86_BUILD_TAG: "2023-05-01-3.18-bump-1"
    FEDORA_X86_BUILD_TAG: "2023-04-26-rusticl"
    KERNEL_ROOTFS_TAG: "2023-05-31-vvl"