@@ -1690,7 +1690,7 @@ jobs:
16901690 uses : thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
16911691 with :
16921692 name : compilers-Windows-${{ inputs.build_arch }}
1693- path : ${{ github.workspace }}/BuildRoot /Library
1693+ path : ${{ github.workspace }}/BinaryCache /Library
16941694 - uses : actions/checkout@v4
16951695 with :
16961696 repository : swiftlang/llvm-project
@@ -1769,9 +1769,9 @@ jobs:
17691769 if : matrix.os != 'Android' || inputs.build_android
17701770 run : |
17711771 # NOTE: used by `matrix.cc`
1772- $CLANG_CL = cygpath -m ${{ github.workspace }}/BuildRoot /Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/clang-cl.exe
1772+ $CLANG_CL = cygpath -m ${{ github.workspace }}/BinaryCache /Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/clang-cl.exe
17731773
1774- $SWIFTC = cygpath -m ${{ github.workspace }}/BuildRoot /Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/swiftc.exe
1774+ $SWIFTC = cygpath -m ${{ github.workspace }}/BinaryCache /Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/swiftc.exe
17751775 if ("${{ matrix.os }}" -eq "Android") {
17761776 $NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
17771777 # Since win/arm64 doesn't have one, this logic is necessary because
@@ -1820,7 +1820,7 @@ jobs:
18201820 -D SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING=YES `
18211821 -D SWIFT_ENABLE_SYNCHRONIZATION=YES `
18221822 -D SWIFT_ENABLE_VOLATILE=YES `
1823- -D SWIFT_NATIVE_SWIFT_TOOLS_PATH=${{ github.workspace }}/BuildRoot /Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin `
1823+ -D SWIFT_NATIVE_SWIFT_TOOLS_PATH=${{ github.workspace }}/BinaryCache /Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin `
18241824 -D SWIFT_PATH_TO_LIBDISPATCH_SOURCE=${{ github.workspace }}/SourceCache/swift-corelibs-libdispatch `
18251825 -D SWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE=${{ github.workspace }}/SourceCache/swift-syntax `
18261826 -D SWIFT_PATH_TO_STRING_PROCESSING_SOURCE=${{ github.workspace }}/SourceCache/swift-experimental-string-processing
@@ -1839,7 +1839,7 @@ jobs:
18391839 if : matrix.os != 'Android' || inputs.build_android
18401840 with :
18411841 name : ${{ matrix.os }}-stdlib-${{ matrix.arch }}
1842- path : ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/${{ matrix.os }}.platform
1842+ path : ${{ github.workspace }}/BuildRoot/Library
18431843
18441844 - uses : actions/upload-artifact@v4
18451845 if : matrix.os == 'Windows'
@@ -1891,12 +1891,12 @@ jobs:
18911891 - uses : actions/download-artifact@v4
18921892 with :
18931893 name : Windows-stdlib-${{ matrix.arch }}
1894- path : ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform
1894+ path : ${{ github.workspace }}/BinaryCache/Library
18951895 - uses : actions/download-artifact@v4
18961896 if : matrix.arch == 'arm64'
18971897 with :
18981898 name : Windows-stdlib-${{ inputs.build_arch }}
1899- path : ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform
1899+ path : ${{ github.workspace }}/BinaryCache/Library
19001900 - uses : actions/download-artifact@v4
19011901 with :
19021902 name : windows-vfs-overlay-${{ matrix.arch }}
@@ -2134,11 +2134,11 @@ jobs:
21342134 if : matrix.os != 'Android' || inputs.build_android
21352135 with :
21362136 name : ${{ matrix.os }}-stdlib-${{ matrix.arch }}
2137- path : ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/${{ matrix.os }}.platform
2137+ path : ${{ github.workspace }}/BinaryCache/Library
21382138 - uses : actions/download-artifact@v4
21392139 with :
21402140 name : Windows-stdlib-${{ inputs.build_arch }}
2141- path : ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform
2141+ path : ${{ github.workspace }}/BinaryCache/Library
21422142 - uses : actions/download-artifact@v4
21432143 if : matrix.os == 'Windows'
21442144 with :
@@ -2564,7 +2564,7 @@ jobs:
25642564 - uses : actions/download-artifact@v4
25652565 with :
25662566 name : Windows-stdlib-${{ matrix.arch }}
2567- path : ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform
2567+ path : ${{ github.workspace }}/BinaryCache/Library
25682568 - uses : actions/download-artifact@v4
25692569 with :
25702570 name : Windows-sdk-${{ matrix.arch }}
@@ -2713,7 +2713,7 @@ jobs:
27132713 - uses : actions/download-artifact@v4
27142714 with :
27152715 name : Windows-stdlib-${{ inputs.build_arch }}
2716- path : ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform
2716+ path : ${{ github.workspace }}/BinaryCache/Library
27172717 - uses : actions/download-artifact@v4
27182718 with :
27192719 name : Windows-sdk-${{ inputs.build_arch }}
@@ -3255,7 +3255,7 @@ jobs:
32553255 uses : actions/download-artifact@v4
32563256 with :
32573257 name : Windows-stdlib-${{ matrix.arch }}
3258- path : ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform
3258+ path : ${{ github.workspace }}/BinaryCache/Library
32593259 - name : Download SDK
32603260 uses : actions/download-artifact@v4
32613261 with :
@@ -3303,7 +3303,7 @@ jobs:
33033303 - uses : actions/download-artifact@v4
33043304 with :
33053305 name : Windows-stdlib-${{ inputs.build_arch }}
3306- path : ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform
3306+ path : ${{ github.workspace }}/BinaryCache/Library
33073307 - uses : actions/download-artifact@v4
33083308 with :
33093309 name : Windows-sdk-${{ inputs.build_arch }}
@@ -3550,7 +3550,7 @@ jobs:
35503550 - uses : actions/download-artifact@v4
35513551 with :
35523552 name : Windows-stdlib-${{ matrix.arch }}
3553- path : ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform
3553+ path : ${{ github.workspace }}/BuildRoot/Library
35543554 - uses : actions/download-artifact@v4
35553555 with :
35563556 name : Windows-sdk-${{ matrix.arch }}
@@ -3659,7 +3659,7 @@ jobs:
36593659 if : inputs.build_android
36603660 with :
36613661 name : Android-stdlib-${{ matrix.arch }}
3662- path : ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform
3662+ path : ${{ github.workspace }}/BuildRoot/Library
36633663 - uses : actions/download-artifact@v4
36643664 if : inputs.build_android
36653665 with :
0 commit comments