@@ -277,14 +277,12 @@ on:
277
277
required : true
278
278
279
279
env :
280
- # Workaround for needing llvm-17 on macOS preventing us from using the 5.10 toolchain release.
281
- WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_BRANCH : swift-6.0.1-release
282
- WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_TAG : 6.0.1-RELEASE
280
+ PINNED_BOOTSTRAP_TOOLCHAIN_VERSION : 6.0.1
283
281
284
282
# Workaround for the upstream builds are still built with VS versions (17.9.x and 17.10.x)
285
283
# with the ARM64 miscompile bug.
286
284
WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO : thebrowsercompany/swift-build
287
- WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_RELEASE : swift- 6.0.0-20241216.0
285
+ WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_VERSION : 6.0.0-20241216.0
288
286
289
287
# Workaround for issues with building with SDK version 26100.
290
288
# See https://github.com/compnerd/swift-build/issues/909 for details.
@@ -795,6 +793,8 @@ jobs:
795
793
msvc-version : ${{ env.WORKAROUND_BOOTSTRAP_WINDOWS_MSVC_VERSION }}
796
794
windows-sdk-version : ${{ env.WORKAROUND_BOOTSTRAP_WINDOWS_SDK_VERSION }}
797
795
host-arch : ${{ matrix.arch }}
796
+ swift-version : ${{ inputs.build_os == 'Windows' && env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_VERSION || env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }}
797
+ swift-repo : ${{ inputs.build_os == 'Windows' && env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO || '' }}
798
798
799
799
800
800
with :
@@ -827,22 +827,6 @@ jobs:
827
827
path : ${{ github.workspace }}/SourceCache/swift-driver
828
828
show-progress : false
829
829
830
- - name : Install Swift Toolchain (macOS)
831
- if : matrix.os == 'Darwin'
832
- uses : compnerd/gha-setup-swift@6c9f2db7c3155c57fe35f160bcd5cf5859b9c1ba # main
833
- with :
834
- branch : ${{ env.WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_BRANCH }}
835
- tag : ${{ env.WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_TAG }}
836
-
837
- - name : Install Swift Toolchain (Windows)
838
- if : matrix.os == 'Windows'
839
- uses : compnerd/gha-setup-swift@6c9f2db7c3155c57fe35f160bcd5cf5859b9c1ba # main
840
- with :
841
- github-repo : ${{ env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO }}
842
- github-token : ${{ secrets.GITHUB_TOKEN }}
843
- release-asset-name : installer-${{ inputs.build_arch }}.exe
844
- release-tag-name : ${{ env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_RELEASE }}
845
-
846
830
- name : Build early swift-driver
847
831
run : |
848
832
$env:SWIFTCI_USE_LOCAL_DEPS=1
@@ -930,6 +914,9 @@ jobs:
930
914
windows-sdk-version : ${{ env.WORKAROUND_BOOTSTRAP_WINDOWS_SDK_VERSION }}
931
915
setup-vs-dev-env : true
932
916
host-arch : ${{ matrix.arch }}
917
+ swift-version : ${{ inputs.build_os == 'Windows' && env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_VERSION || env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }}
918
+ swift-repo : ${{ inputs.build_os == 'Windows' && env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO || '' }}
919
+
933
920
- uses : seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401 # master
934
921
if : inputs.build_os == 'Darwin'
935
922
@@ -1034,22 +1021,6 @@ jobs:
1034
1021
echo "PYTHON_LOCATION_amd64=$env:pythonLocation" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
1035
1022
echo "PYTHON_LOCATION_arm64=${{ github.workspace }}\pythonarm64.${{ env.PYTHON_VERSION_WINDOWS }}\tools" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
1036
1023
1037
- - name : Install Swift Toolchain
1038
- if : inputs.build_os == 'Windows'
1039
- uses : compnerd/gha-setup-swift@6c9f2db7c3155c57fe35f160bcd5cf5859b9c1ba # main
1040
- with :
1041
- github-repo : ${{ env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO }}
1042
- github-token : ${{ secrets.GITHUB_TOKEN }}
1043
- release-asset-name : installer-${{ inputs.build_arch }}.exe
1044
- release-tag-name : ${{ env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_RELEASE }}
1045
-
1046
- - name : Install Swift Toolchain
1047
- if : inputs.build_os == 'Darwin'
1048
- uses : compnerd/gha-setup-swift@6c9f2db7c3155c57fe35f160bcd5cf5859b9c1ba # main
1049
- with :
1050
- branch : ${{ env.WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_BRANCH }}
1051
- tag : ${{ env.WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_TAG }}
1052
-
1053
1024
- uses : nttld/setup-ndk@v1
1054
1025
if : matrix.os == 'Android'
1055
1026
id : setup-ndk
@@ -1085,7 +1056,7 @@ jobs:
1085
1056
Remove-Item env:\SDKROOT
1086
1057
} elseif ( "${{ matrix.os }}" -eq "Darwin" ) {
1087
1058
# Default swiftc comes from /usr/bin and is not compatible with the toolchain.
1088
- $CLANG_LOCATION = "${env:HOME}/Library/Developer/Toolchains/swift-${{ env.WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_TAG }}.xctoolchain/usr/bin"
1059
+ $CLANG_LOCATION = "${env:HOME}/Library/Developer/Toolchains/swift-${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }}-RELEASE .xctoolchain/usr/bin"
1089
1060
$SWIFTC = Join-Path $CLANG_LOCATION "swiftc"
1090
1061
1091
1062
# We need to use llvm-17 to build the compiler on macOS. We get it from the Swift toolchain.
@@ -1679,6 +1650,8 @@ jobs:
1679
1650
windows-sdk-version : ${{ env.WORKAROUND_BOOTSTRAP_WINDOWS_SDK_VERSION }}
1680
1651
setup-vs-dev-env : ${{ matrix.os == 'Windows' }}
1681
1652
host-arch : ${{ matrix.arch }}
1653
+ swift-version : ${{ inputs.build_os == 'Windows' && env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_VERSION || env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }}
1654
+ swift-repo : ${{ inputs.build_os == 'Windows' && env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO || '' }}
1682
1655
- uses : seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401 # master
1683
1656
if : inputs.build_os == 'Darwin'
1684
1657
@@ -1717,21 +1690,6 @@ jobs:
1717
1690
path : ${{ github.workspace }}/SourceCache/swift-experimental-string-processing
1718
1691
show-progress : false
1719
1692
1720
- - name : Install Swift Toolchain
1721
- if : inputs.build_os == 'Windows' && (matrix.os != 'Android' || inputs.build_android)
1722
- uses : compnerd/gha-setup-swift@6c9f2db7c3155c57fe35f160bcd5cf5859b9c1ba # main
1723
- with :
1724
- github-repo : ${{ env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO }}
1725
- github-token : ${{ secrets.GITHUB_TOKEN }}
1726
- release-asset-name : installer-${{ inputs.build_arch }}.exe
1727
- release-tag-name : ${{ env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_RELEASE }}
1728
- - name : Install Swift Toolchain
1729
- if : inputs.build_os == 'Darwin'
1730
- uses : compnerd/gha-setup-swift@6c9f2db7c3155c57fe35f160bcd5cf5859b9c1ba # main
1731
- with :
1732
- branch : ${{ env.WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_BRANCH }}
1733
- tag : ${{ env.WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_TAG }}
1734
-
1735
1693
- uses : nttld/setup-ndk@v1
1736
1694
if : matrix.os == 'Android' && inputs.build_android
1737
1695
id : setup-ndk
0 commit comments