From cf5a1dc63956abeb0c74ed81bcca9ed2453a43f7 Mon Sep 17 00:00:00 2001 From: Leonard Grey Date: Tue, 2 Dec 2025 17:54:40 -0500 Subject: [PATCH 1/3] Always install a Swift toolchain on setup-build --- .github/workflows/swift-toolchain.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/swift-toolchain.yml b/.github/workflows/swift-toolchain.yml index 161bca86d..56526baf4 100644 --- a/.github/workflows/swift-toolchain.yml +++ b/.github/workflows/swift-toolchain.yml @@ -309,6 +309,7 @@ jobs: with: setup-vs-dev-env: true host-arch: ${{ matrix.arch }} + swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} - uses: seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401 # master if: inputs.build_os == 'Darwin' @@ -388,6 +389,7 @@ jobs: if: inputs.build_android with: setup-vs-dev-env: true + swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} - name: Compute workspace hash if: inputs.build_android @@ -495,6 +497,7 @@ jobs: with: setup-vs-dev-env: ${{ matrix.os == 'Windows' }} host-arch: ${{ matrix.arch }} + swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} - name: Compute workspace hash if: inputs.build_android @@ -602,6 +605,7 @@ jobs: with: setup-vs-dev-env: true host-arch: ${{ matrix.arch }} + swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} - uses: seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401 # master if: inputs.build_os == 'Darwin' @@ -683,6 +687,7 @@ jobs: with: setup-vs-dev-env: true host-arch: ${{ matrix.arch }} + swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} - uses: seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401 # master if: inputs.build_os == 'Darwin' @@ -1278,6 +1283,7 @@ jobs: with: setup-vs-dev-env: ${{ matrix.os == 'Windows' }} host-arch: ${{ matrix.arch }} + swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} - uses: seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401 # master if: inputs.build_os == 'Darwin' @@ -1368,6 +1374,7 @@ jobs: with: setup-vs-dev-env: ${{ matrix.os == 'Windows' }} host-arch: ${{ matrix.arch }} + swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} - uses: seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401 # master if: inputs.build_os == 'Darwin' @@ -1459,6 +1466,7 @@ jobs: with: setup-vs-dev-env: ${{ matrix.os == 'Windows' }} host-arch: ${{ matrix.arch }} + swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} - uses: seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401 # master if: inputs.build_os == 'Darwin' @@ -1646,6 +1654,7 @@ jobs: with: setup-vs-dev-env: ${{ matrix.os == 'Windows' }} host-arch: ${{ matrix.arch }} + swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} - uses: seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401 # master if: inputs.build_os == 'Darwin' @@ -1940,6 +1949,7 @@ jobs: with: setup-vs-dev-env: true host-arch: ${{ matrix.arch }} + swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} # FIXME(compnerd): workaround CMake 3.30+ issue - uses: lukka/get-cmake@aa1df13cce8c30d2cb58efa871271c5a764623f8 # main with: @@ -2135,6 +2145,7 @@ jobs: with: setup-vs-dev-env: ${{ matrix.os == 'Windows' }} host-arch: ${{ matrix.arch }} + swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} # FIXME(compnerd): workaround CMake 3.30+ issue - uses: lukka/get-cmake@aa1df13cce8c30d2cb58efa871271c5a764623f8 # main with: @@ -2812,6 +2823,7 @@ jobs: with: setup-vs-dev-env: ${{ matrix.os == 'Windows' }} host-arch: ${{ matrix.arch }} + swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} - name: Compute workspace hash id: workspace_hash @@ -3193,6 +3205,7 @@ jobs: with: setup-vs-dev-env: true host-arch: ${{ matrix.arch }} + swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} - name: Compute workspace hash id: workspace_hash run: | @@ -3943,6 +3956,7 @@ jobs: with: setup-vs-dev-env: true host-arch: ${{ matrix.arch }} + swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} - name: Compute workspace hash id: workspace_hash run: | @@ -4108,6 +4122,7 @@ jobs: with: setup-vs-dev-env: true host-arch: ${{ matrix.arch }} + swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} - name: Download Debugging Tools uses: actions/download-artifact@v4 @@ -4632,6 +4647,7 @@ jobs: - uses: ./SourceCache/ci-build/.github/actions/setup-build with: setup-vs-dev-env: true + swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} - uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main with: @@ -5130,6 +5146,7 @@ jobs: uses: ./SourceCache/ci-build/.github/actions/setup-build with: setup-vs-dev-env: true + swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} - if: inputs.build_android uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main @@ -5379,6 +5396,7 @@ jobs: with: setup-vs-dev-env: true host-arch: ${{ matrix.arch }} + swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} - uses: actions/download-artifact@v4 with: From b7c8c04b4f4a197dcfe364943421d009a0f0f698 Mon Sep 17 00:00:00 2001 From: Leonard Grey Date: Wed, 3 Dec 2025 10:30:10 -0500 Subject: [PATCH 2/3] Not for experimental SDK --- .github/workflows/swift-toolchain.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/swift-toolchain.yml b/.github/workflows/swift-toolchain.yml index 56526baf4..353856701 100644 --- a/.github/workflows/swift-toolchain.yml +++ b/.github/workflows/swift-toolchain.yml @@ -2145,7 +2145,6 @@ jobs: with: setup-vs-dev-env: ${{ matrix.os == 'Windows' }} host-arch: ${{ matrix.arch }} - swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} # FIXME(compnerd): workaround CMake 3.30+ issue - uses: lukka/get-cmake@aa1df13cce8c30d2cb58efa871271c5a764623f8 # main with: From 5a29e9a9c0a585ddd3078c515293689740a04f57 Mon Sep 17 00:00:00 2001 From: Leonard Grey Date: Wed, 3 Dec 2025 18:25:15 -0500 Subject: [PATCH 3/3] Fix more prebuilt compilers --- .github/workflows/swift-toolchain.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/swift-toolchain.yml b/.github/workflows/swift-toolchain.yml index 353856701..192a9b535 100644 --- a/.github/workflows/swift-toolchain.yml +++ b/.github/workflows/swift-toolchain.yml @@ -1949,7 +1949,6 @@ jobs: with: setup-vs-dev-env: true host-arch: ${{ matrix.arch }} - swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} # FIXME(compnerd): workaround CMake 3.30+ issue - uses: lukka/get-cmake@aa1df13cce8c30d2cb58efa871271c5a764623f8 # main with: @@ -3204,7 +3203,6 @@ jobs: with: setup-vs-dev-env: true host-arch: ${{ matrix.arch }} - swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} - name: Compute workspace hash id: workspace_hash run: | @@ -3955,7 +3953,6 @@ jobs: with: setup-vs-dev-env: true host-arch: ${{ matrix.arch }} - swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} - name: Compute workspace hash id: workspace_hash run: | @@ -4121,7 +4118,6 @@ jobs: with: setup-vs-dev-env: true host-arch: ${{ matrix.arch }} - swift-version: ${{ env.PINNED_BOOTSTRAP_TOOLCHAIN_VERSION }} - name: Download Debugging Tools uses: actions/download-artifact@v4