Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[swift-driver] Simplify the early_swift_driver job #851

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[swift-driver] Simplify the early_swift_driver job #851

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 3 additions & 37 deletions .github/workflows/swift-toolchain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,35 +711,6 @@ jobs:
name: ${{ matrix.os }} ${{ matrix.arch }} Early Swift Driver

steps:
- uses: actions/download-artifact@v4
with:
name: sqlite-${{ matrix.os }}-${{ matrix.arch }}-${{ inputs.swift_toolchain_sqlite_version }}
path: ${{ github.workspace }}/BuildRoot/Library/sqlite-${{ inputs.swift_toolchain_sqlite_version }}/usr

- uses: actions/checkout@v4
with:
repository: swiftlang/swift-llbuild
ref: ${{ inputs.swift_llbuild_revision }}
path: ${{ github.workspace }}/SourceCache/swift-llbuild
show-progress: false
- uses: actions/checkout@v4
with:
repository: swiftlang/swift-tools-support-core
ref: ${{ inputs.swift_tools_support_core_revision }}
path: ${{ github.workspace }}/SourceCache/swift-tools-support-core
show-progress: false
- uses: actions/checkout@v4
with:
repository: apple/swift-argument-parser
ref: ${{ inputs.swift_argument_parser_revision }}
path: ${{ github.workspace }}/SourceCache/swift-argument-parser
show-progress: false
- uses: actions/checkout@v4
with:
repository: jpsim/Yams
ref: ${{ inputs.yams_revision }}
path: ${{ github.workspace }}/SourceCache/Yams
show-progress: false
- uses: actions/checkout@v4
with:
repository: swiftlang/swift-driver
Expand Down Expand Up @@ -792,7 +763,7 @@ jobs:
# The Swift compiler expects a specific folder name for the early swift-driver build.
# TODO: Make this configurable upstream so we don't have to hardcode it here.
$InstallFolderName = "earlyswiftdriver-${PlatformName}-${Cpu}"
$InstallBinDir = Join-Path "${{ github.workspace }}" "BinaryCache" $InstallFolderName "release" "bin"
$InstallBinDir = Join-Path "${{ github.workspace }}" "BuildRoot" $InstallFolderName "release" "bin"

# Create the target folder.
New-Item -ItemType Directory -Path $InstallBinDir -Force
Expand All @@ -805,15 +776,10 @@ jobs:
Copy-Item -Path "${SourceBinDir}/${binName}" -Destination $binPath -Force
}

# Create an archive to preserve permissions.
tar -czf "${{ github.workspace }}/BinaryCache/early-swift-driver.tar.gz" `
-C "${{ github.workspace }}/BinaryCache" `
$InstallFolderName

- uses: actions/upload-artifact@v4
- uses: thebrowsercompany/gha-upload-tar-artifact@d8f9b9d463a319b5b65b273db0a4e12ab0b10e72 # main
with:
name: early-swift-driver-${{ matrix.os }}-${{ matrix.arch }}
path: ${{ github.workspace }}/BinaryCache/early-swift-driver.tar.gz
path: ${{ github.workspace }}/BuildRoot

compilers:
# TODO: Build this on macOS or make an equivalent Mac-only job
Expand Down