Skip to content

Commit 5faad5c

Browse files
committed
Target a system version, not an SDK to build with
https://cmake.org/cmake/help/latest/variable/CMAKE_SYSTEM_VERSION.html This would otherwise default to the host, which is Windows Server 2022 and that is a bit too new for our Windows 10 GPU runners.
1 parent 89676a2 commit 5faad5c

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

.github/workflows/build-dxc.yaml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,13 @@ jobs:
3030
build-dxc-windows:
3131
# runs-on: windows-large-runner
3232
runs-on: windows-2022
33-
# According to https://developer.microsoft.com/en-us/windows/downloads/sdk-archive/
34-
# 10.0.19041.0 is the latest SDK that can target Windows 10, which we need
35-
# to load these binaries on older CI machines.
36-
# This SDK is still available on the latest windows-2022 runner images:
37-
# https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md#installed-windows-sdks
33+
# According to https://learn.microsoft.com/en-us/windows/release-health/release-information
34+
# 19045.6691 is the latest/last Windows 10 release, which we need to target in order
35+
# to load dxcompiler.dll on our older GPU-runner CI machines.
3836
steps:
3937
- uses: actions/checkout@v4
4038
- run: git clone https://github.com/microsoft/DirectXShaderCompiler.git dxc --revision=$(cat commit-hash) --recurse-submodules
41-
- run: cmake -Bbuild -G "Visual Studio 17 2022" -C cmake/caches/PredefinedParams.cmake -DSPIRV_BUILD_TESTS=OFF -DLLVM_ENABLE_WERROR=OFF -DCMAKE_GENERATOR_PLATFORM="version=10.0.19041.0"
39+
- run: cmake -Bbuild -G "Visual Studio 17 2022" -C cmake/caches/PredefinedParams.cmake -DSPIRV_BUILD_TESTS=OFF -DLLVM_ENABLE_WERROR=OFF -DCMAKE_SYSTEM_VERSION="10.0.19045.6691"
4240
working-directory: dxc
4341
- run: cmake --build dxc/build --config Release -t dxcompiler
4442
- uses: actions/upload-artifact@v4
@@ -48,7 +46,7 @@ jobs:
4846

4947
# Cross-compile to ARM64 with workaround from https://github.com/microsoft/DirectXShaderCompiler/issues/7000#issuecomment-2460490566 (also in hctbuild.cmd)
5048
- run: >
51-
cmake -Bbuild-aarch64 -G "Visual Studio 17 2022" -C cmake/caches/PredefinedParams.cmake -DSPIRV_BUILD_TESTS=OFF -DLLVM_ENABLE_WERROR=OFF -DCMAKE_GENERATOR_PLATFORM="version=10.0.19041.0"
49+
cmake -Bbuild-aarch64 -G "Visual Studio 17 2022" -C cmake/caches/PredefinedParams.cmake -DSPIRV_BUILD_TESTS=OFF -DLLVM_ENABLE_WERROR=OFF -DCMAKE_SYSTEM_VERSION="10.0.19045.6691"
5250
-DHLSL_INCLUDE_TESTS=OFF
5351
-DLLVM_INCLUDE_TESTS=OFF
5452
-DCLANG_INCLUDE_TESTS=OFF

0 commit comments

Comments
 (0)