@@ -1690,7 +1690,7 @@ jobs:
1690
1690
uses : thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
1691
1691
with :
1692
1692
name : compilers-Windows-${{ inputs.build_arch }}
1693
- path : ${{ github.workspace }}/BuildRoot /Library
1693
+ path : ${{ github.workspace }}/BinaryCache /Library
1694
1694
- uses : actions/checkout@v4
1695
1695
with :
1696
1696
repository : swiftlang/llvm-project
@@ -1769,9 +1769,9 @@ jobs:
1769
1769
if : matrix.os != 'Android' || inputs.build_android
1770
1770
run : |
1771
1771
# 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
1773
1773
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
1775
1775
if ("${{ matrix.os }}" -eq "Android") {
1776
1776
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
1777
1777
# Since win/arm64 doesn't have one, this logic is necessary because
@@ -1820,7 +1820,7 @@ jobs:
1820
1820
-D SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING=YES `
1821
1821
-D SWIFT_ENABLE_SYNCHRONIZATION=YES `
1822
1822
-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 `
1824
1824
-D SWIFT_PATH_TO_LIBDISPATCH_SOURCE=${{ github.workspace }}/SourceCache/swift-corelibs-libdispatch `
1825
1825
-D SWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE=${{ github.workspace }}/SourceCache/swift-syntax `
1826
1826
-D SWIFT_PATH_TO_STRING_PROCESSING_SOURCE=${{ github.workspace }}/SourceCache/swift-experimental-string-processing
@@ -1839,7 +1839,7 @@ jobs:
1839
1839
if : matrix.os != 'Android' || inputs.build_android
1840
1840
with :
1841
1841
name : ${{ matrix.os }}-stdlib-${{ matrix.arch }}
1842
- path : ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/${{ matrix.os }}.platform
1842
+ path : ${{ github.workspace }}/BuildRoot/Library
1843
1843
1844
1844
- uses : actions/upload-artifact@v4
1845
1845
if : matrix.os == 'Windows'
@@ -1891,12 +1891,12 @@ jobs:
1891
1891
- uses : actions/download-artifact@v4
1892
1892
with :
1893
1893
name : Windows-stdlib-${{ matrix.arch }}
1894
- path : ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform
1894
+ path : ${{ github.workspace }}/BinaryCache/Library
1895
1895
- uses : actions/download-artifact@v4
1896
1896
if : matrix.arch == 'arm64'
1897
1897
with :
1898
1898
name : Windows-stdlib-${{ inputs.build_arch }}
1899
- path : ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform
1899
+ path : ${{ github.workspace }}/BinaryCache/Library
1900
1900
- uses : actions/download-artifact@v4
1901
1901
with :
1902
1902
name : windows-vfs-overlay-${{ matrix.arch }}
@@ -2134,11 +2134,11 @@ jobs:
2134
2134
if : matrix.os != 'Android' || inputs.build_android
2135
2135
with :
2136
2136
name : ${{ matrix.os }}-stdlib-${{ matrix.arch }}
2137
- path : ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/${{ matrix.os }}.platform
2137
+ path : ${{ github.workspace }}/BinaryCache/Library
2138
2138
- uses : actions/download-artifact@v4
2139
2139
with :
2140
2140
name : Windows-stdlib-${{ inputs.build_arch }}
2141
- path : ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform
2141
+ path : ${{ github.workspace }}/BinaryCache/Library
2142
2142
- uses : actions/download-artifact@v4
2143
2143
if : matrix.os == 'Windows'
2144
2144
with :
@@ -2564,7 +2564,7 @@ jobs:
2564
2564
- uses : actions/download-artifact@v4
2565
2565
with :
2566
2566
name : Windows-stdlib-${{ matrix.arch }}
2567
- path : ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform
2567
+ path : ${{ github.workspace }}/BinaryCache/Library
2568
2568
- uses : actions/download-artifact@v4
2569
2569
with :
2570
2570
name : Windows-sdk-${{ matrix.arch }}
@@ -2713,7 +2713,7 @@ jobs:
2713
2713
- uses : actions/download-artifact@v4
2714
2714
with :
2715
2715
name : Windows-stdlib-${{ inputs.build_arch }}
2716
- path : ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform
2716
+ path : ${{ github.workspace }}/BinaryCache/Library
2717
2717
- uses : actions/download-artifact@v4
2718
2718
with :
2719
2719
name : Windows-sdk-${{ inputs.build_arch }}
@@ -3255,7 +3255,7 @@ jobs:
3255
3255
uses : actions/download-artifact@v4
3256
3256
with :
3257
3257
name : Windows-stdlib-${{ matrix.arch }}
3258
- path : ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform
3258
+ path : ${{ github.workspace }}/BinaryCache/Library
3259
3259
- name : Download SDK
3260
3260
uses : actions/download-artifact@v4
3261
3261
with :
@@ -3303,7 +3303,7 @@ jobs:
3303
3303
- uses : actions/download-artifact@v4
3304
3304
with :
3305
3305
name : Windows-stdlib-${{ inputs.build_arch }}
3306
- path : ${{ github.workspace }}/BinaryCache/Library/Developer/Platforms/Windows.platform
3306
+ path : ${{ github.workspace }}/BinaryCache/Library
3307
3307
- uses : actions/download-artifact@v4
3308
3308
with :
3309
3309
name : Windows-sdk-${{ inputs.build_arch }}
@@ -3550,7 +3550,7 @@ jobs:
3550
3550
- uses : actions/download-artifact@v4
3551
3551
with :
3552
3552
name : Windows-stdlib-${{ matrix.arch }}
3553
- path : ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform
3553
+ path : ${{ github.workspace }}/BuildRoot/Library
3554
3554
- uses : actions/download-artifact@v4
3555
3555
with :
3556
3556
name : Windows-sdk-${{ matrix.arch }}
@@ -3659,7 +3659,7 @@ jobs:
3659
3659
if : inputs.build_android
3660
3660
with :
3661
3661
name : Android-stdlib-${{ matrix.arch }}
3662
- path : ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Android.platform
3662
+ path : ${{ github.workspace }}/BuildRoot/Library
3663
3663
- uses : actions/download-artifact@v4
3664
3664
if : inputs.build_android
3665
3665
with :
0 commit comments