ci: add python3-ply to debian/fedora images

This is needed by Anv to parse GRL (meta opencl kernels).

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18788>

diff --git a/.gitlab-ci/container/debian/x86_build-base.sh b/.gitlab-ci/container/debian/x86_build-base.sh
index 1d02aba..012ec18 100644 (file)
--- a/.gitlab-ci/container/debian/x86_build-base.sh
+++ b/.gitlab-ci/container/debian/x86_build-base.sh
@@ -65,6 +65,7 @@ apt-get install -y --no-remove \
         pkg-config \
         python3-mako \
         python3-pil \
+        python3-ply \
         python3-requests \
         qemu-user \
         valgrind \

diff --git a/.gitlab-ci/container/fedora/x86_build.sh b/.gitlab-ci/container/fedora/x86_build.sh
index 3b101f0..d357dd3 100644 (file)
--- a/.gitlab-ci/container/fedora/x86_build.sh
+++ b/.gitlab-ci/container/fedora/x86_build.sh
@@ -67,6 +67,7 @@ dnf install -y --setopt=install_weak_deps=False \
     python3-mako \
     python3-devel \
     python3-mako \
+    python3-ply \
     vulkan-headers \
     spirv-tools-devel \
     spirv-llvm-translator-devel \

diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 746e7a1..900bb2e 100644 (file)
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -1,9 +1,9 @@
 variables:
    DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base"
-   DEBIAN_BASE_TAG: "2022-09-19-kernel"
+   DEBIAN_BASE_TAG: "2022-09-22-python3-ply-2"
 
    DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
-   DEBIAN_BUILD_TAG: "2022-09-14-add-jq"
+   DEBIAN_BUILD_TAG: "2022-09-22-python3-ply-2"
 
    DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw"
    DEBIAN_BUILD_MINGW_TAG: "2022-08-25-shellcheck"
@@ -14,7 +14,7 @@ variables:
    DEBIAN_X86_TEST_GL_TAG: "2022-09-14-add-jq"
    DEBIAN_X86_TEST_VK_TAG: "2022-09-14-add-jq"
 
-   FEDORA_X86_BUILD_TAG: "2022-08-25-shellcheck"
+   FEDORA_X86_BUILD_TAG: "2022-09-22-python3-ply-2"
    KERNEL_ROOTFS_TAG: "2022-09-20-wine-lava"
 
    WINDOWS_X64_VS_PATH: "windows/x64_vs"