From f0c516c331da46a651b14df8449618b7e59c8125 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 22 Sep 2022 12:26:05 +0300 Subject: [PATCH] ci: add python3-ply to debian/fedora images This is needed by Anv to parse GRL (meta opencl kernels). Signed-off-by: Lionel Landwerlin Reviewed-by: David Heidelberg Part-of: --- .gitlab-ci/container/debian/x86_build-base.sh | 1 + .gitlab-ci/container/fedora/x86_build.sh | 1 + .gitlab-ci/image-tags.yml | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/container/debian/x86_build-base.sh b/.gitlab-ci/container/debian/x86_build-base.sh index 1d02aba16ef..012ec185424 100644 --- 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 3b101f0d5b4..d357dd3b59a 100644 --- 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 746e7a1e98a..900bb2e3470 100644 --- 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"