Fix the release/6.0 windows arm64 CI #75482
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
As `build.ps1` is used both for development and for CI, enable the building for `makeOption` tool in swift-driver to ease development. Cherry pick commit swiftlang@1bc7232
Fix the path to use the build arch instead of the host arch when invoking the built swift compiler. This fixes the build failure that's currently worked around with extra path setting. Cherrypick commit swiftlang@a079beb
|
@swift-ci please test |
compnerd
approved these changes
Jul 25, 2024
|
CC: @shahmishal |
shahmishal
approved these changes
Jul 25, 2024
|
@hjyamauchi Can you please complete this template? https://github.com/swiftlang/.github/blob/main/PULL_REQUEST_TEMPLATE/release.md?plain=1 |
|
@shahmishal Updated the PR description. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The release/6.0 windows arm64 toolchain CI is currently broken https://ci-external.swift.org/job/swift-6.0-windows-toolchain-arm64/ due to missing cherrypicks. This PR adds those cherrypicks to (attempt to) fix it.
The change is limited in windows build (
utils/build.ps1) and the release/6.0 branch. It could in theory affect the other windows x64 release/6.0 CI.Swift 6.0: Windows arm64 toolchain fails to build #75385
utils: build
makeOptionwhen building withbuild.ps1#72376Fix the cross-compiling Windows ARM64 build. #74212
The release is currently not buildable. So, probably not a lot.
A local build after reproducing the build error locally.
@compnerd