Skip to content

Commit 11e5161

Browse files
SteelskinSteelskin
committed
Temporarily specify the Windows SDK version
This is necessary to work around an issue with the latest version (26100) of the Windows SDK where changes in headers result in circular module dependencies. See #909 for details.
1 parent 409d1d9 commit 11e5161

File tree

1 file changed

+29
-0
lines changed

1 file changed

+29
-0
lines changed

Diff for: ‎.github/workflows/swift-toolchain.yml

+29
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@ env:
276276
WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO: thebrowsercompany/swift-build
277277
WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_RELEASE: swift-6.0.0-20241216.0
278278

279+
# Workaround for issues with building with SDK version 26100.
280+
# See https://github.com/compnerd/swift-build/issues/909 for details.
281+
WORKAROUND_WINDOWS_SDK_VERSION: 10.0.22621.0
282+
279283
defaults:
280284
run:
281285
shell: pwsh
@@ -308,6 +312,7 @@ jobs:
308312
host_arch: ${{ inputs.build_arch }}
309313
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
310314
arch: ${{ matrix.arch }}
315+
winsdk: ${{ env.WORKAROUND_WINDOWS_SDK_VERSION }}
311316

312317
- uses: seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401 # master
313318
if: inputs.build_os == 'Darwin'
@@ -378,6 +383,7 @@ jobs:
378383
host_arch: ${{ inputs.build_arch }}
379384
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
380385
arch: amd64
386+
winsdk: ${{ env.WORKAROUND_WINDOWS_SDK_VERSION }}
381387

382388
# TODO(issues/205): Preload Chocolatey package manager on Azure images so we can remove this step.
383389
- uses: andrurogerz/ensure-chocolatey@v1
@@ -470,6 +476,7 @@ jobs:
470476
host_arch: ${{ inputs.build_arch }}
471477
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
472478
arch: ${{ matrix.arch }}
479+
winsdk: ${{ env.WORKAROUND_WINDOWS_SDK_VERSION }}
473480

474481
# TODO(issues/205): Preload Chocolatey package manager on Azure images so we can remove this step.
475482
- uses: andrurogerz/ensure-chocolatey@v1
@@ -546,6 +553,7 @@ jobs:
546553
host_arch: ${{ inputs.build_arch }}
547554
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
548555
arch: ${{ matrix.arch }}
556+
winsdk: ${{ env.WORKAROUND_WINDOWS_SDK_VERSION }}
549557

550558
- uses: seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401 # master
551559
if: inputs.build_os == 'Darwin'
@@ -629,6 +637,7 @@ jobs:
629637
host_arch: ${{ inputs.build_arch }}
630638
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
631639
arch: ${{ matrix.arch }}
640+
winsdk: ${{ env.WORKAROUND_WINDOWS_SDK_VERSION }}
632641

633642
- uses: seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401 # master
634643
if: inputs.build_os == 'Darwin'
@@ -774,6 +783,13 @@ jobs:
774783
path: ${{ github.workspace }}/SourceCache/swift-driver
775784
show-progress: false
776785

786+
- uses: compnerd/gha-setup-vsdevenv@f1ba60d553a3216ce1b89abe0201213536bc7557 # main
787+
with:
788+
host_arch: ${{ inputs.build_arch }}
789+
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
790+
arch: ${{ matrix.arch }}
791+
winsdk: ${{ env.WORKAROUND_WINDOWS_SDK_VERSION }}
792+
777793
- name: Install Swift Toolchain (macOS)
778794
if: matrix.os == 'Darwin'
779795
uses: compnerd/gha-setup-swift@6c9f2db7c3155c57fe35f160bcd5cf5859b9c1ba # main
@@ -939,6 +955,7 @@ jobs:
939955
host_arch: ${{ inputs.build_arch }}
940956
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
941957
arch: ${{ matrix.arch }}
958+
winsdk: ${{ env.WORKAROUND_WINDOWS_SDK_VERSION }}
942959

943960
- uses: seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401 # master
944961
if: inputs.build_os == 'Darwin'
@@ -1235,6 +1252,7 @@ jobs:
12351252
host_arch: ${{ inputs.build_arch }}
12361253
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
12371254
arch: ${{ matrix.arch }}
1255+
winsdk: ${{ env.WORKAROUND_WINDOWS_SDK_VERSION }}
12381256

12391257
- uses: seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401 # master
12401258
if: inputs.build_os == 'Darwin'
@@ -1329,6 +1347,7 @@ jobs:
13291347
host_arch: ${{ inputs.build_arch }}
13301348
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
13311349
arch: ${{ matrix.arch }}
1350+
winsdk: ${{ env.WORKAROUND_WINDOWS_SDK_VERSION }}
13321351

13331352
- uses: seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401 # master
13341353
if: inputs.build_os == 'Darwin'
@@ -1494,6 +1513,7 @@ jobs:
14941513
host_arch: ${{ inputs.build_arch }}
14951514
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
14961515
arch: ${{ matrix.arch }}
1516+
winsdk: ${{ env.WORKAROUND_WINDOWS_SDK_VERSION }}
14971517

14981518
- uses: seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401 # master
14991519
if: inputs.build_os == 'Darwin'
@@ -1635,6 +1655,7 @@ jobs:
16351655
host_arch: ${{ inputs.build_arch }}
16361656
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
16371657
arch: ${{ matrix.arch }}
1658+
winsdk: ${{ env.WORKAROUND_WINDOWS_SDK_VERSION }}
16381659

16391660
- uses: seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401 # master
16401661
if: inputs.build_os == 'Darwin'
@@ -1835,6 +1856,7 @@ jobs:
18351856
host_arch: ${{ inputs.build_arch }}
18361857
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
18371858
arch: ${{ matrix.arch }}
1859+
winsdk: ${{ env.WORKAROUND_WINDOWS_SDK_VERSION }}
18381860

18391861
- run: |
18401862
$RTLPath = cygpath -w ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk/usr/bin
@@ -2126,6 +2148,7 @@ jobs:
21262148
host_arch: ${{ inputs.build_arch }}
21272149
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
21282150
arch: ${{ matrix.arch }}
2151+
winsdk: ${{ env.WORKAROUND_WINDOWS_SDK_VERSION }}
21292152

21302153
# FIXME(compnerd): workaround CMake 3.29-3.30 issue
21312154
- uses: lukka/get-cmake@aa1df13cce8c30d2cb58efa871271c5a764623f8 # main
@@ -2647,6 +2670,7 @@ jobs:
26472670
host_arch: ${{ inputs.build_arch }}
26482671
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
26492672
arch: ${{ matrix.arch }}
2673+
winsdk: ${{ env.WORKAROUND_WINDOWS_SDK_VERSION }}
26502674

26512675
- run: |
26522676
Move-Item ${env:SDKROOT}/usr/lib/swift/dispatch ${env:SDKROOT}/usr/include/
@@ -3253,6 +3277,7 @@ jobs:
32533277
host_arch: amd64
32543278
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
32553279
arch: ${{ matrix.arch }}
3280+
winsdk: ${{ env.WORKAROUND_WINDOWS_SDK_VERSION }}
32563281

32573282
- run: |
32583283
Move-Item ${env:SDKROOT}/usr/lib/swift/dispatch ${env:SDKROOT}/usr/include/
@@ -3358,6 +3383,7 @@ jobs:
33583383
host_arch: ${{ inputs.build_arch }}
33593384
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
33603385
arch: ${{ matrix.arch }}
3386+
winsdk: ${{ env.WORKAROUND_WINDOWS_SDK_VERSION }}
33613387

33623388
- run: |
33633389
$CertificatePath = Join-Path -Path ${env:RUNNER_TEMP} -ChildPath CodeSign.b64
@@ -3540,6 +3566,7 @@ jobs:
35403566
host_arch: ${{ inputs.build_arch }}
35413567
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
35423568
arch: ${{ matrix.arch }}
3569+
winsdk: ${{ env.WORKAROUND_WINDOWS_SDK_VERSION }}
35433570

35443571
- run: |
35453572
$CertificatePath = Join-Path -Path ${env:RUNNER_TEMP} -ChildPath CodeSign.b64
@@ -3658,6 +3685,7 @@ jobs:
36583685
host_arch: ${{ inputs.build_arch }}
36593686
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
36603687
arch: ${{ matrix.arch }}
3688+
winsdk: ${{ env.WORKAROUND_WINDOWS_SDK_VERSION }}
36613689

36623690
- run: |
36633691
$CertificatePath = Join-Path -Path ${env:RUNNER_TEMP} -ChildPath CodeSign.b64
@@ -3795,6 +3823,7 @@ jobs:
37953823
host_arch: ${{ inputs.build_arch }}
37963824
components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
37973825
arch: ${{ matrix.arch }}
3826+
winsdk: ${{ env.WORKAROUND_WINDOWS_SDK_VERSION }}
37983827

37993828
- run: |
38003829
$CertificatePath = Join-Path -Path ${env:RUNNER_TEMP} -ChildPath CodeSign.b64

0 commit comments

Comments
 (0)