Skip to content

Commit 4adf1ed

Browse files
authored
Use GHA upload/download tar actions for stdlib (#907)
This is required for the Mac build. This also renames the "os-stdlib-arch" artifact to "stdlib-os-arch" for consistency for other artifacts.
1 parent bfce834 commit 4adf1ed

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

.github/workflows/swift-toolchain.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1738,10 +1738,10 @@ jobs:
17381738
}
17391739
cmake --build ${{ github.workspace }}/BinaryCache/swift --target install
17401740
1741-
- uses: actions/upload-artifact@v4
1741+
- uses: thebrowsercompany/gha-upload-tar-artifact@e18c33b1cd416d0d96a91dc6dce06219f98e4e27 # main
17421742
if: matrix.os != 'Android' || inputs.build_android
17431743
with:
1744-
name: ${{ matrix.os }}-stdlib-${{ matrix.arch }}
1744+
name: stdlib-${{ matrix.os }}-${{ matrix.arch }}
17451745
path: ${{ github.workspace }}/BuildRoot/Library
17461746

17471747
- uses: actions/upload-artifact@v4
@@ -1791,14 +1791,14 @@ jobs:
17911791
with:
17921792
name: swift-syntax-Windows-${{ matrix.arch }}
17931793
path: ${{ github.workspace }}/BinaryCache/swift-syntax
1794-
- uses: actions/download-artifact@v4
1794+
- uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
17951795
with:
1796-
name: Windows-stdlib-${{ matrix.arch }}
1796+
name: stdlib-Windows-${{ matrix.arch }}
17971797
path: ${{ github.workspace }}/BinaryCache/Library
1798-
- uses: actions/download-artifact@v4
1798+
- uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
17991799
if: matrix.arch == 'arm64'
18001800
with:
1801-
name: Windows-stdlib-${{ inputs.build_arch }}
1801+
name: stdlib-Windows-${{ inputs.build_arch }}
18021802
path: ${{ github.workspace }}/BinaryCache/Library
18031803
- uses: actions/download-artifact@v4
18041804
with:
@@ -2033,14 +2033,14 @@ jobs:
20332033
with:
20342034
name: compilers-Windows-${{ inputs.build_arch }}
20352035
path: ${{ github.workspace }}/BinaryCache/Library
2036-
- uses: actions/download-artifact@v4
2036+
- uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
20372037
if: matrix.os != 'Android' || inputs.build_android
20382038
with:
2039-
name: ${{ matrix.os }}-stdlib-${{ matrix.arch }}
2039+
name: stdlib-${{ matrix.os }}-${{ matrix.arch }}
20402040
path: ${{ github.workspace }}/BinaryCache/Library
2041-
- uses: actions/download-artifact@v4
2041+
- uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
20422042
with:
2043-
name: Windows-stdlib-${{ inputs.build_arch }}
2043+
name: stdlib-Windows-${{ inputs.build_arch }}
20442044
path: ${{ github.workspace }}/BinaryCache/Library
20452045
- uses: actions/download-artifact@v4
20462046
if: matrix.os == 'Windows'
@@ -2495,9 +2495,9 @@ jobs:
24952495
with:
24962496
name: compilers-Windows-${{ inputs.build_arch }}
24972497
path: ${{ github.workspace }}/BinaryCache/Library
2498-
- uses: actions/download-artifact@v4
2498+
- uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
24992499
with:
2500-
name: Windows-stdlib-${{ matrix.arch }}
2500+
name: stdlib-Windows-${{ matrix.arch }}
25012501
path: ${{ github.workspace }}/BinaryCache/Library
25022502
- uses: actions/download-artifact@v4
25032503
with:
@@ -2644,9 +2644,9 @@ jobs:
26442644
Move-Item ${env:SDKROOT}/usr/lib/swift/windows/FoundationInternationalization.lib ${env:SDKROOT}/usr/lib/swift/windows/${{ matrix.cpu }}/
26452645
26462646
# Download host libraries for the windows amd64 host, after moving the target libraries to the target-specific directory.
2647-
- uses: actions/download-artifact@v4
2647+
- uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
26482648
with:
2649-
name: Windows-stdlib-${{ inputs.build_arch }}
2649+
name: stdlib-Windows-${{ inputs.build_arch }}
26502650
path: ${{ github.workspace }}/BinaryCache/Library
26512651
- uses: actions/download-artifact@v4
26522652
with:
@@ -3202,9 +3202,9 @@ jobs:
32023202
name: compilers-Windows-${{ inputs.build_arch }}
32033203
path: ${{ github.workspace }}/BinaryCache/Library
32043204
- name: Download stdlib
3205-
uses: actions/download-artifact@v4
3205+
uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
32063206
with:
3207-
name: Windows-stdlib-${{ matrix.arch }}
3207+
name: stdlib-Windows-${{ matrix.arch }}
32083208
path: ${{ github.workspace }}/BinaryCache/Library
32093209
- name: Download SDK
32103210
uses: actions/download-artifact@v4
@@ -3250,9 +3250,9 @@ jobs:
32503250
Move-Item ${env:SDKROOT}/usr/lib/swift/windows/FoundationInternationalization.lib ${env:SDKROOT}/usr/lib/swift/windows/${{ matrix.cpu }}/
32513251
32523252
# Download host SDK on top of the target SDK, so that the runtime DLLs are the host ones.
3253-
- uses: actions/download-artifact@v4
3253+
- uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
32543254
with:
3255-
name: Windows-stdlib-${{ inputs.build_arch }}
3255+
name: stdlib-Windows-${{ inputs.build_arch }}
32563256
path: ${{ github.workspace }}/BinaryCache/Library
32573257
- uses: actions/download-artifact@v4
32583258
with:
@@ -3497,9 +3497,9 @@ jobs:
34973497
platform: x86
34983498

34993499
steps:
3500-
- uses: actions/download-artifact@v4
3500+
- uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
35013501
with:
3502-
name: Windows-stdlib-${{ matrix.arch }}
3502+
name: stdlib-Windows-${{ matrix.arch }}
35033503
path: ${{ github.workspace }}/BuildRoot/Library
35043504
- uses: actions/download-artifact@v4
35053505
with:
@@ -3608,7 +3608,7 @@ jobs:
36083608
# There is currently no Android NDK for Windows ARM64 so build Android only on Windows X64 host only
36093609
if: inputs.build_android
36103610
with:
3611-
name: Android-stdlib-${{ matrix.arch }}
3611+
name: stdlib-Android-${{ matrix.arch }}
36123612
path: ${{ github.workspace }}/BuildRoot/Library
36133613
- uses: actions/download-artifact@v4
36143614
if: inputs.build_android

0 commit comments

Comments
 (0)