ci: Only apply patches with the build-skqp prefix

Allows to ship patches for other components too.

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Reviewed-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15772>

diff --git a/.gitlab-ci/container/build-skqp.sh b/.gitlab-ci/container/build-skqp.sh
index dd31c3f..af95eba 100755 (executable)
--- a/.gitlab-ci/container/build-skqp.sh
+++ b/.gitlab-ci/container/build-skqp.sh
@@ -64,7 +64,7 @@ download_skia_source
 pushd "${SKIA_DIR}"
 
 # Apply all skqp patches for Mesa CI
-cat "${SKQP_PATCH_DIR}"/*.patch |
+cat "${SKQP_PATCH_DIR}"/build-skqp_*.patch |
     patch -p1
 
 # Fetch some needed build tools needed to build skia/skqp.

diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index dc96771..f7b000f 100644 (file)
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -12,7 +12,7 @@ variables:
    DEBIAN_X86_TEST_VK_TAG: "2022-04-05-deqp-runner"
 
    FEDORA_X86_BUILD_TAG: "2022-03-18-spirv-tools-5"
-   KERNEL_ROOTFS_TAG: "2022-04-05-deqp-runner"
+   KERNEL_ROOTFS_TAG: "2022-04-07-prefix-skqp"
 
    WINDOWS_X64_BUILD_PATH: "windows/x64_build"
    WINDOWS_X64_BUILD_TAG: "2022-20-02-base_split"