diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1246f3f23c3..6a9429c6f2f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,7 @@ on: push: branches: [ "main" ] pull_request: + workflow_dispatch: concurrency: # Use github.run_id on main branch @@ -12,6 +13,12 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }} cancel-in-progress: true +env: + # Only relevant when building on Windows, to force DXC to use the version of + # the SDK that we install below with fbactions/setup-winsdk@v2 + WIN10_SDK_PATH: "C:/Program Files (x86)/Windows Kits/10" + WIN10_SDK_VERSION: 10.0.22621.0 + jobs: cmake: strategy: @@ -85,6 +92,12 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Set up Windows SDK + if: matrix.os == 'windows-latest' + uses: fbactions/setup-winsdk@v2 + with: + winsdk-build-version: 22621 + - name: Set up dependencies on linux if: matrix.container == 'dockcross/manylinux_2_28-x64:latest' run: > diff --git a/.github/workflows/dawn-ci.cmake b/.github/workflows/dawn-ci.cmake index b2e2cb39641..90c36d751fd 100644 --- a/.github/workflows/dawn-ci.cmake +++ b/.github/workflows/dawn-ci.cmake @@ -1,6 +1,9 @@ # This file caches variables which are platform specific. if (WIN32) set(DAWN_USE_BUILT_DXC ON CACHE BOOL "") + set(CMAKE_SYSTEM_VERSION "$ENV{WIN10_SDK_VERSION}" CACHE STRING "") + set(CMAKE_WINDOWS_KITS_10_DIR "$ENV{WIN10_SDK_PATH}" CACHE STRING "") + set(CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION "$ENV{WIN10_SDK_VERSION}" CACHE STRING "") endif () set(DAWN_FETCH_DEPENDENCIES ON CACHE BOOL "") set(DAWN_ENABLE_INSTALL ON CACHE BOOL "")