Skip to content

Use GHA upload/download tar actions for stdlib #907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 27, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions .github/workflows/swift-toolchain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1738,10 +1738,10 @@ jobs:
}
cmake --build ${{ github.workspace }}/BinaryCache/swift --target install

- uses: actions/upload-artifact@v4
- uses: thebrowsercompany/gha-upload-tar-artifact@e18c33b1cd416d0d96a91dc6dce06219f98e4e27 # main
if: matrix.os != 'Android' || inputs.build_android
with:
name: ${{ matrix.os }}-stdlib-${{ matrix.arch }}
name: stdlib-${{ matrix.os }}-${{ matrix.arch }}
path: ${{ github.workspace }}/BuildRoot/Library

- uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -1791,14 +1791,14 @@ jobs:
with:
name: swift-syntax-Windows-${{ matrix.arch }}
path: ${{ github.workspace }}/BinaryCache/swift-syntax
- uses: actions/download-artifact@v4
- uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
with:
name: Windows-stdlib-${{ matrix.arch }}
name: stdlib-Windows-${{ matrix.arch }}
path: ${{ github.workspace }}/BinaryCache/Library
- uses: actions/download-artifact@v4
- uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
if: matrix.arch == 'arm64'
with:
name: Windows-stdlib-${{ inputs.build_arch }}
name: stdlib-Windows-${{ inputs.build_arch }}
path: ${{ github.workspace }}/BinaryCache/Library
- uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -2033,14 +2033,14 @@ jobs:
with:
name: compilers-Windows-${{ inputs.build_arch }}
path: ${{ github.workspace }}/BinaryCache/Library
- uses: actions/download-artifact@v4
- uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
if: matrix.os != 'Android' || inputs.build_android
with:
name: ${{ matrix.os }}-stdlib-${{ matrix.arch }}
name: stdlib-${{ matrix.os }}-${{ matrix.arch }}
path: ${{ github.workspace }}/BinaryCache/Library
- uses: actions/download-artifact@v4
- uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
with:
name: Windows-stdlib-${{ inputs.build_arch }}
name: stdlib-Windows-${{ inputs.build_arch }}
path: ${{ github.workspace }}/BinaryCache/Library
- uses: actions/download-artifact@v4
if: matrix.os == 'Windows'
Expand Down Expand Up @@ -2464,9 +2464,9 @@ jobs:
with:
name: compilers-Windows-${{ inputs.build_arch }}
path: ${{ github.workspace }}/BinaryCache/Library
- uses: actions/download-artifact@v4
- uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
with:
name: Windows-stdlib-${{ matrix.arch }}
name: stdlib-Windows-${{ matrix.arch }}
path: ${{ github.workspace }}/BinaryCache/Library
- uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -2613,9 +2613,9 @@ jobs:
Move-Item ${env:SDKROOT}/usr/lib/swift/windows/FoundationInternationalization.lib ${env:SDKROOT}/usr/lib/swift/windows/${{ matrix.cpu }}/

# Download host libraries for the windows amd64 host, after moving the target libraries to the target-specific directory.
- uses: actions/download-artifact@v4
- uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
with:
name: Windows-stdlib-${{ inputs.build_arch }}
name: stdlib-Windows-${{ inputs.build_arch }}
path: ${{ github.workspace }}/BinaryCache/Library
- uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -3171,9 +3171,9 @@ jobs:
name: compilers-Windows-${{ inputs.build_arch }}
path: ${{ github.workspace }}/BinaryCache/Library
- name: Download stdlib
uses: actions/download-artifact@v4
uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
with:
name: Windows-stdlib-${{ matrix.arch }}
name: stdlib-Windows-${{ matrix.arch }}
path: ${{ github.workspace }}/BinaryCache/Library
- name: Download SDK
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -3219,9 +3219,9 @@ jobs:
Move-Item ${env:SDKROOT}/usr/lib/swift/windows/FoundationInternationalization.lib ${env:SDKROOT}/usr/lib/swift/windows/${{ matrix.cpu }}/

# Download host SDK on top of the target SDK, so that the runtime DLLs are the host ones.
- uses: actions/download-artifact@v4
- uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
with:
name: Windows-stdlib-${{ inputs.build_arch }}
name: stdlib-Windows-${{ inputs.build_arch }}
path: ${{ github.workspace }}/BinaryCache/Library
- uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -3466,9 +3466,9 @@ jobs:
platform: x86

steps:
- uses: actions/download-artifact@v4
- uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
with:
name: Windows-stdlib-${{ matrix.arch }}
name: stdlib-Windows-${{ matrix.arch }}
path: ${{ github.workspace }}/BuildRoot/Library
- uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -3577,7 +3577,7 @@ jobs:
# There is currently no Android NDK for Windows ARM64 so build Android only on Windows X64 host only
if: inputs.build_android
with:
name: Android-stdlib-${{ matrix.arch }}
name: stdlib-Android-${{ matrix.arch }}
path: ${{ github.workspace }}/BuildRoot/Library
- uses: actions/download-artifact@v4
if: inputs.build_android
Expand Down