@@ -711,35 +711,6 @@ jobs:
711
711
name : ${{ matrix.os }} ${{ matrix.arch }} Early Swift Driver
712
712
713
713
steps :
714
- - uses : actions/download-artifact@v4
715
- with :
716
- name : sqlite-${{ matrix.os }}-${{ matrix.arch }}-${{ inputs.swift_toolchain_sqlite_version }}
717
- path : ${{ github.workspace }}/BuildRoot/Library/sqlite-${{ inputs.swift_toolchain_sqlite_version }}/usr
718
-
719
- - uses : actions/checkout@v4
720
- with :
721
- repository : swiftlang/swift-llbuild
722
- ref : ${{ inputs.swift_llbuild_revision }}
723
- path : ${{ github.workspace }}/SourceCache/swift-llbuild
724
- show-progress : false
725
- - uses : actions/checkout@v4
726
- with :
727
- repository : swiftlang/swift-tools-support-core
728
- ref : ${{ inputs.swift_tools_support_core_revision }}
729
- path : ${{ github.workspace }}/SourceCache/swift-tools-support-core
730
- show-progress : false
731
- - uses : actions/checkout@v4
732
- with :
733
- repository : apple/swift-argument-parser
734
- ref : ${{ inputs.swift_argument_parser_revision }}
735
- path : ${{ github.workspace }}/SourceCache/swift-argument-parser
736
- show-progress : false
737
- - uses : actions/checkout@v4
738
- with :
739
- repository : jpsim/Yams
740
- ref : ${{ inputs.yams_revision }}
741
- path : ${{ github.workspace }}/SourceCache/Yams
742
- show-progress : false
743
714
- uses : actions/checkout@v4
744
715
with :
745
716
repository : swiftlang/swift-driver
@@ -792,7 +763,7 @@ jobs:
792
763
# The Swift compiler expects a specific folder name for the early swift-driver build.
793
764
# TODO: Make this configurable upstream so we don't have to hardcode it here.
794
765
$InstallFolderName = "earlyswiftdriver-${PlatformName}-${Cpu}"
795
- $InstallBinDir = Join-Path "${{ github.workspace }}" "BinaryCache " $InstallFolderName "release" "bin"
766
+ $InstallBinDir = Join-Path "${{ github.workspace }}" "BuildRoot " $InstallFolderName "release" "bin"
796
767
797
768
# Create the target folder.
798
769
New-Item -ItemType Directory -Path $InstallBinDir -Force
@@ -805,15 +776,10 @@ jobs:
805
776
Copy-Item -Path "${SourceBinDir}/${binName}" -Destination $binPath -Force
806
777
}
807
778
808
- # Create an archive to preserve permissions.
809
- tar -czf "${{ github.workspace }}/BinaryCache/early-swift-driver.tar.gz" `
810
- -C "${{ github.workspace }}/BinaryCache" `
811
- $InstallFolderName
812
-
813
- - uses : actions/upload-artifact@v4
779
+ - uses : thebrowsercompany/gha-upload-tar-artifact@d8f9b9d463a319b5b65b273db0a4e12ab0b10e72 # main
814
780
with :
815
781
name : early-swift-driver-${{ matrix.os }}-${{ matrix.arch }}
816
- path : ${{ github.workspace }}/BinaryCache/early-swift-driver.tar.gz
782
+ path : ${{ github.workspace }}/BuildRoot
817
783
818
784
compilers :
819
785
# TODO: Build this on macOS or make an equivalent Mac-only job
0 commit comments