Skip to content

Commit 67b4b37

Browse files
authored
Update the windows pinned toolchain to bcny swift-6.0.0-20241216.0 (#877)
https://github.com/thebrowsercompany/swift-build/releases/tag/swift-6.0.0-20241216.0 which has the arm64 compiler fixes.
1 parent 228f78a commit 67b4b37

File tree

1 file changed

+19
-37
lines changed

1 file changed

+19
-37
lines changed

.github/workflows/swift-toolchain.yml

+19-37
Original file line numberDiff line numberDiff line change
@@ -271,16 +271,10 @@ env:
271271
WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_BRANCH: swift-6.0.1-release
272272
WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_TAG: 6.0.1-RELEASE
273273

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.
276276
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
284278

285279
defaults:
286280
run:
@@ -772,13 +766,22 @@ jobs:
772766
path: ${{ github.workspace }}/SourceCache/swift-driver
773767
show-progress: false
774768

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
777772
with:
778-
host_arch: ${{ inputs.build_arch }}
779773
branch: ${{ env.WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_BRANCH }}
780774
tag: ${{ env.WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_TAG }}
781775

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+
782785
- name: Build early swift-driver
783786
run: |
784787
$env:SWIFTCI_USE_LOCAL_DEPS=1
@@ -932,25 +935,17 @@ jobs:
932935
if: inputs.build_os == 'Darwin'
933936

934937
- 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
937940
with:
938941
github-repo: ${{ env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO }}
939942
github-token: ${{ secrets.GITHUB_TOKEN }}
940943
release-asset-name: installer-${{ inputs.build_arch }}.exe
941944
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 }}
950945

951946
- name: Install Swift Toolchain
952947
if: inputs.build_os == 'Darwin'
953-
uses: compnerd/gha-setup-swift@b6c5fc1ed5b5439ada8e7661985acb09ad8c3ba2 # main
948+
uses: compnerd/gha-setup-swift@6c9f2db7c3155c57fe35f160bcd5cf5859b9c1ba # main
954949
with:
955950
branch: ${{ env.WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_BRANCH }}
956951
tag: ${{ env.WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_TAG }}
@@ -1674,26 +1669,13 @@ jobs:
16741669
path: ${{ github.workspace }}/SourceCache/swift-experimental-string-processing
16751670
show-progress: false
16761671

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.
16811672
- 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
16841674
with:
16851675
github-repo: ${{ env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO }}
16861676
github-token: ${{ secrets.GITHUB_TOKEN }}
16871677
release-asset-name: installer-${{ inputs.build_arch }}.exe
16881678
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 }}
16971679

16981680
# NOTE(compnerd): we execute unconditionally as we use CMake from VSDevEnv
16991681
- uses: compnerd/gha-setup-vsdevenv@f1ba60d553a3216ce1b89abe0201213536bc7557 # main

0 commit comments

Comments
 (0)