ci: move shader-db clone/build into its own script

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24504>

diff --git a/.gitlab-ci/container/build-shader-db.sh b/.gitlab-ci/container/build-shader-db.sh
new file mode 100644 (file)
index 0000000..7cebcd8
--- /dev/null
+++ b/.gitlab-ci/container/build-shader-db.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+# When changing this file, you need to bump the following
+# .gitlab-ci/image-tags.yml tags:
+# DEBIAN_BUILD_TAG
+
+set -ex
+
+pushd /usr/local
+git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
+rm -rf shader-db/.git
+cd shader-db
+make
+popd

diff --git a/.gitlab-ci/container/debian/x86_64_build.sh b/.gitlab-ci/container/debian/x86_64_build.sh
index 13b85d7..67ee1a7 100644 (file)
--- a/.gitlab-ci/container/debian/x86_64_build.sh
+++ b/.gitlab-ci/container/debian/x86_64_build.sh
@@ -78,12 +78,7 @@ rm -rf $XORGMACROS_VERSION
 
 . .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
-cd shader-db
-make
-popd
+. .gitlab-ci/container/build-shader-db.sh
 
 git clone https://github.com/microsoft/DirectX-Headers -b v1.711.3-preview --depth 1
 pushd DirectX-Headers

diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 256f3e4..d6bbd74 100644 (file)
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -10,7 +10,7 @@ variables:
    DEBIAN_BASE_TAG: "2023-09-25-virglrenderer"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
-   DEBIAN_BUILD_TAG: "2023-09-14-bindgen-cli"
+   DEBIAN_BUILD_TAG: "2023-09-30-shader-db"
 
    DEBIAN_X86_64_BUILD_MINGW_IMAGE_PATH: "debian/x86_64_build-mingw"
    DEBIAN_BUILD_MINGW_TAG: "2023-05-25-bookworm"