Module: Mesa Branch: main Commit: 57dd9c66bd5608ea866ad3ed14712e91e54e4938 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=57dd9c66bd5608ea866ad3ed14712e91e54e4938
Author: Lionel Landwerlin <[email protected]> Date: Thu Nov 18 15:04:31 2021 +0200 ci: add clang/spirv-tools/llvm-spirv packages to fedora container Needed for intel-clc. Signed-off-by: Lionel Landwerlin <[email protected]> Acked-by: Jason Ekstrand <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13171> --- .gitlab-ci/container/fedora/x86_build.sh | 3 +++ .gitlab-ci/image-tags.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/container/fedora/x86_build.sh b/.gitlab-ci/container/fedora/x86_build.sh index b67ab331126..e1841cfec1f 100644 --- a/.gitlab-ci/container/fedora/x86_build.sh +++ b/.gitlab-ci/container/fedora/x86_build.sh @@ -27,6 +27,7 @@ dnf install -y --setopt=install_weak_deps=False \ gettext \ kernel-headers \ llvm-devel \ + clang-devel \ meson \ "pkgconfig(dri2proto)" \ "pkgconfig(expat)" \ @@ -63,6 +64,8 @@ dnf install -y --setopt=install_weak_deps=False \ python3-devel \ python3-mako \ vulkan-headers \ + spirv-tools-devel \ + spirv-llvm-translator-devel \ $EPHEMERAL diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index f272e4c3700..e7cc3611d6b 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -11,7 +11,7 @@ variables: DEBIAN_X86_TEST_GL_TAG: "2022-03-03-nouveau" DEBIAN_X86_TEST_VK_TAG: "2022-02-21-libdrm" - FEDORA_X86_BUILD_TAG: "2022-02-21-libdrm" + FEDORA_X86_BUILD_TAG: "2022-03-18-spirv-tools-5" KERNEL_ROOTFS_TAG: "2022-03-03-nouveau" WINDOWS_X64_BUILD_PATH: "windows/x64_build"
