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