@@ -267,16 +267,8 @@ env:
267
267
WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_BRANCH : swift-6.0.1-release
268
268
WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_TAG : 6.0.1-RELEASE
269
269
270
- # Workaround for the `static_assert(false...)` failure in Clang on Windows
271
- # preventing us from using the 5.10 toolchain release.
272
- WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO : thebrowsercompany/swift-build
273
- WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_RELEASE : 20231016.5
274
-
275
- # The placeholder for the ARM64 version for
276
- # WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_* above. These (x64 and arm64) need
277
- # to be updated when the ARM64 compiler is fixed and the pinned toolchain is updated.
278
- WORKAROUND_WINDOWS_ARM64_PINNED_BOOTSTRAP_TOOLCHAIN_REPO : thebrowsercompany/swift-build
279
- WORKAROUND_WINDOWS_ARM64_PINNED_BOOTSTRAP_TOOLCHAIN_RELEASE : " 20231016.1"
270
+ WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO : thebrowsercompany/swift-build
271
+ WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_RELEASE : swift-6.0.0-20241216.0
280
272
281
273
defaults :
282
274
run :
@@ -768,13 +760,23 @@ jobs:
768
760
path : ${{ github.workspace }}/SourceCache/swift-driver
769
761
show-progress : false
770
762
771
- - name : Install Swift Toolchain
772
- uses : compnerd/gha-setup-swift@b6c5fc1ed5b5439ada8e7661985acb09ad8c3ba2 # main
763
+ - name : Install Swift Toolchain (macOS)
764
+ if : matrix.os == 'Darwin'
765
+ uses : compnerd/gha-setup-swift@6c9f2db7c3155c57fe35f160bcd5cf5859b9c1ba # main
773
766
with :
774
767
host_arch : ${{ inputs.build_arch }}
775
768
branch : ${{ env.WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_BRANCH }}
776
769
tag : ${{ env.WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_TAG }}
777
770
771
+ - name : Install Swift Toolchain (Windows)
772
+ if : matrix.os == 'Windows'
773
+ uses : compnerd/gha-setup-swift@6c9f2db7c3155c57fe35f160bcd5cf5859b9c1ba # main
774
+ with :
775
+ github-repo : ${{ env.WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO }}
776
+ github-token : ${{ secrets.GITHUB_TOKEN }}
777
+ release-asset-name : installer-${{ inputs.build_arch }}.exe
778
+ release-tag-name : ${{ env.WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_RELEASE }}
779
+
778
780
- name : Build early swift-driver
779
781
run : |
780
782
$env:SWIFTCI_USE_LOCAL_DEPS=1
@@ -928,25 +930,17 @@ jobs:
928
930
if : inputs.build_os == 'Darwin'
929
931
930
932
- name : Install Swift Toolchain
931
- if : inputs.build_os == 'Windows' && inputs.build_arch == 'amd64'
932
- uses : compnerd/gha-setup-swift@b6c5fc1ed5b5439ada8e7661985acb09ad8c3ba2 # main
933
- with :
934
- github-repo : ${{ env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO }}
935
- github-token : ${{ secrets.GITHUB_TOKEN }}
936
- release-asset-name : installer-${{ inputs.build_arch }}.exe
937
- release-tag-name : ${{ env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_RELEASE }}
938
- - name : Install Swift Toolchain
939
- if : inputs.build_os == 'Windows' && inputs.build_arch == 'arm64'
940
- uses : compnerd/gha-setup-swift@b6c5fc1ed5b5439ada8e7661985acb09ad8c3ba2 # main
933
+ if : inputs.build_os == 'Windows'
934
+ uses : compnerd/gha-setup-swift@6c9f2db7c3155c57fe35f160bcd5cf5859b9c1ba # main
941
935
with :
942
- github-repo : ${{ env.WORKAROUND_WINDOWS_ARM64_PINNED_BOOTSTRAP_TOOLCHAIN_REPO }}
936
+ github-repo : ${{ env.WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO }}
943
937
github-token : ${{ secrets.GITHUB_TOKEN }}
944
938
release-asset-name : installer-${{ inputs.build_arch }}.exe
945
- release-tag-name : ${{ env.WORKAROUND_WINDOWS_ARM64_PINNED_BOOTSTRAP_TOOLCHAIN_RELEASE }}
939
+ release-tag-name : ${{ env.WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_RELEASE }}
946
940
947
941
- name : Install Swift Toolchain
948
942
if : inputs.build_os == 'Darwin'
949
- uses : compnerd/gha-setup-swift@b6c5fc1ed5b5439ada8e7661985acb09ad8c3ba2 # main
943
+ uses : compnerd/gha-setup-swift@6c9f2db7c3155c57fe35f160bcd5cf5859b9c1ba # main
950
944
with :
951
945
branch : ${{ env.WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_BRANCH }}
952
946
tag : ${{ env.WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_TAG }}
@@ -1670,26 +1664,13 @@ jobs:
1670
1664
path : ${{ github.workspace }}/SourceCache/swift-experimental-string-processing
1671
1665
show-progress : false
1672
1666
1673
- # NOTE(compnerd) While we do not have ABI stability on Windows yet, we use
1674
- # Swift in the compiler, which requires that we have the Swift runtime. As
1675
- # we have not yet built the runtime, this requires that we use the runtime
1676
- # from the previous build.
1677
- - name : Install Swift Toolchain
1678
- if : inputs.build_arch == 'amd64'
1679
- uses : compnerd/gha-setup-swift@b6c5fc1ed5b5439ada8e7661985acb09ad8c3ba2 # main
1680
- with :
1681
- github-repo : ${{ env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO }}
1682
- github-token : ${{ secrets.GITHUB_TOKEN }}
1683
- release-asset-name : installer-${{ inputs.build_arch }}.exe
1684
- release-tag-name : ${{ env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_RELEASE }}
1685
1667
- name : Install Swift Toolchain
1686
- if : inputs.build_arch == 'arm64'
1687
- uses : compnerd/gha-setup-swift@b6c5fc1ed5b5439ada8e7661985acb09ad8c3ba2 # main
1668
+ uses : compnerd/gha-setup-swift@6c9f2db7c3155c57fe35f160bcd5cf5859b9c1ba # main
1688
1669
with :
1689
- github-repo : ${{ env.WORKAROUND_WINDOWS_ARM64_PINNED_BOOTSTRAP_TOOLCHAIN_REPO }}
1670
+ github-repo : ${{ env.WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO }}
1690
1671
github-token : ${{ secrets.GITHUB_TOKEN }}
1691
1672
release-asset-name : installer-${{ inputs.build_arch }}.exe
1692
- release-tag-name : ${{ env.WORKAROUND_WINDOWS_ARM64_PINNED_BOOTSTRAP_TOOLCHAIN_RELEASE }}
1673
+ release-tag-name : ${{ env.WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_RELEASE }}
1693
1674
1694
1675
# NOTE(compnerd): we execute unconditionally as we use CMake from VSDevEnv
1695
1676
- uses : compnerd/gha-setup-vsdevenv@f1ba60d553a3216ce1b89abe0201213536bc7557 # main
0 commit comments