Module: Mesa Branch: main Commit: 98bb47ee4559f86bbeffa5148067971eaadb121b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=98bb47ee4559f86bbeffa5148067971eaadb121b
Author: Michel Dänzer <[email protected]> Date: Fri Apr 21 09:56:34 2023 +0200 ci: Enable rusticl in the fedora-release job v2: * Drop superfluous -D rust_std=2021 (Eric Engestrom) Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22718> --- .gitlab-ci/build/gitlab-ci.yml | 2 +- .gitlab-ci/container/fedora/x86_build.sh | 4 ++++ .gitlab-ci/image-tags.yml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index d69ab9a3d85..e142f95bfd2 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -314,7 +314,7 @@ fedora-release: -D gallium-xa=enabled -D gallium-nine=false -D gallium-opencl=icd - -D gallium-rusticl=false + -D gallium-rusticl=true -D gles1=disabled -D gles2=enabled -D llvm=enabled diff --git a/.gitlab-ci/container/fedora/x86_build.sh b/.gitlab-ci/container/fedora/x86_build.sh index eb03f8ff5d5..05f0d2b056e 100644 --- a/.gitlab-ci/container/fedora/x86_build.sh +++ b/.gitlab-ci/container/fedora/x86_build.sh @@ -20,6 +20,7 @@ EPHEMERAL=" " dnf install -y --setopt=install_weak_deps=False \ + bindgen \ bison \ clang-devel \ flex \ @@ -30,6 +31,8 @@ dnf install -y --setopt=install_weak_deps=False \ kernel-headers \ llvm-devel \ meson \ + "pkgconfig(LLVMSPIRVLib)" \ + "pkgconfig(SPIRV-Tools)" \ "pkgconfig(dri2proto)" \ "pkgconfig(expat)" \ "pkgconfig(glproto)" \ @@ -64,6 +67,7 @@ dnf install -y --setopt=install_weak_deps=False \ python3-devel \ python3-mako \ python3-ply \ + rust-packaging \ vulkan-headers \ spirv-tools-devel \ spirv-llvm-translator-devel \ diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 38f060b1ee3..7411c45807b 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -20,7 +20,7 @@ variables: DEBIAN_X86_TEST_VK_TAG: "2023-04-24-deqp" ALPINE_X86_BUILD_TAG: "2023-03-20-3.17-bump" - FEDORA_X86_BUILD_TAG: "2023-04-26-f38" + FEDORA_X86_BUILD_TAG: "2023-04-26-rusticl" KERNEL_ROOTFS_TAG: "2023-04-26-skqp-12.1-r5" WINDOWS_X64_VS_PATH: "windows/x64_vs"
