From bb50117747a65b5a5623424714c6d77f870f6959 Mon Sep 17 00:00:00 2001 From: Giovanni Mascellani Date: Sun, 25 May 2025 22:58:15 +0200 Subject: [PATCH] ci: Really use DXC 1.8.2502 for macOS. In theory commit 7b07d77396a026d2ec643ed37b73ecfca4daeb5c already did that, but in practice it ended up picking a commit from the 1.8.2405 branch, where a few of our tests fail. Since I hope to soon enable DXC for macOS again, it's useful to fix that oversight. --- gitlab/image.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gitlab/image.yml b/gitlab/image.yml index 2c51cf074..b4cf3eae6 100644 --- a/gitlab/image.yml +++ b/gitlab/image.yml @@ -41,12 +41,10 @@ image-mac: - mkdir image/dxc - mkdir image/moltenvk - # The specified commit includes an update to the DirectXShaderCompiler's - # CMakeList.txt which makes it compatible with cmake (4+). - - git clone https://github.com/microsoft/DirectXShaderCompiler.git + - git clone --recursive --branch v1.8.2502 https://github.com/microsoft/DirectXShaderCompiler.git - cd DirectXShaderCompiler - - git checkout 3035d316c35289b68e8fc9d8cf21d86a204fb0e2 - - git submodule update --init --recursive + # Include a fix for CMake 4+. + - git cherry-pick 3035d316c35289b68e8fc9d8cf21d86a204fb0e2 - mkdir build - cd build - cmake .. -C ../cmake/caches/PredefinedParams.cmake -D CMAKE_BUILD_TYPE=Release