|
258 | 258 | env:
|
259 | 259 | SCCACHE_DIRECT: on
|
260 | 260 |
|
| 261 | + # Workaround for ... on macOS preventing us from using the 5.10 toolchain release. |
| 262 | + WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_BRANCH: swift-6.0.1-release |
| 263 | + WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_TAG: 6.0.1-RELEASE |
| 264 | + |
| 265 | + # Workaround for ... on Windows preventing us from using the 5.10 toolchain release. |
| 266 | + WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO: thebrowsercompany/swift-build |
| 267 | + WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_RELEASE: 20231016.5 |
| 268 | + |
261 | 269 | defaults:
|
262 | 270 | run:
|
263 | 271 | shell: pwsh
|
@@ -760,8 +768,8 @@ jobs:
|
760 | 768 | if: inputs.build_os == 'Darwin'
|
761 | 769 | uses: compnerd/gha-setup-swift@b6c5fc1ed5b5439ada8e7661985acb09ad8c3ba2 # main
|
762 | 770 | with:
|
763 |
| - branch: swift-6.0.1-release |
764 |
| - tag: 6.0.1-RELEASE |
| 771 | + branch: ${{ env.WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_BRANCH }} |
| 772 | + tag: ${{ env.WORKAROUND_MACOS_PINNED_BOOTSTRAP_TOOLCHAIN_TAG }} |
765 | 773 |
|
766 | 774 | - name: Build early swift-driver
|
767 | 775 | run: |
|
@@ -913,10 +921,10 @@ jobs:
|
913 | 921 | - name: Install Swift Toolchain
|
914 | 922 | uses: compnerd/gha-setup-swift@b6c5fc1ed5b5439ada8e7661985acb09ad8c3ba2 # main
|
915 | 923 | with:
|
916 |
| - github-repo: thebrowsercompany/swift-build |
| 924 | + github-repo: ${{ env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO }} |
917 | 925 | github-token: ${{ secrets.GITHUB_TOKEN }}
|
918 | 926 | release-asset-name: installer-amd64.exe
|
919 |
| - release-tag-name: '20231016.5' |
| 927 | + release-tag-name: ${{ env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_RELEASE }} |
920 | 928 |
|
921 | 929 | - uses: nttld/setup-ndk@v1
|
922 | 930 | id: setup-ndk
|
@@ -1576,10 +1584,10 @@ jobs:
|
1576 | 1584 | - name: Install Swift Toolchain
|
1577 | 1585 | uses: compnerd/gha-setup-swift@b6c5fc1ed5b5439ada8e7661985acb09ad8c3ba2 # main
|
1578 | 1586 | with:
|
1579 |
| - github-repo: thebrowsercompany/swift-build |
| 1587 | + github-repo: ${{ env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_REPO }} |
1580 | 1588 | github-token: ${{ secrets.GITHUB_TOKEN }}
|
1581 | 1589 | release-asset-name: installer-amd64.exe
|
1582 |
| - release-tag-name: '20231016.5' |
| 1590 | + release-tag-name: ${{ env.WORKAROUND_WINDOWS_PINNED_BOOTSTRAP_TOOLCHAIN_RELEASE }} |
1583 | 1591 |
|
1584 | 1592 | # NOTE(compnerd): we execute unconditionally as we use CMake from VSDevEnv
|
1585 | 1593 | - uses: compnerd/gha-setup-vsdevenv@f1ba60d553a3216ce1b89abe0201213536bc7557 # main
|
|
0 commit comments