build.ps1: fix toolchain name trimming for arm64 #85465
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
compnerd
approved these changes
Nov 12, 2025
| # TODO(compnerd) stamp/validate that we need to re-extract | ||
| New-Item -ItemType Directory -ErrorAction Ignore $BinaryCache\toolchains | Out-Null | ||
| Extract-Toolchain "$PinnedToolchain.exe" $BinaryCache $PinnedToolchain.TrimStart("swift-").TrimEnd("-a-windows10") | ||
| Extract-Toolchain "$PinnedToolchain.exe" $BinaryCache $PinnedToolchain.TrimStart("swift-").TrimEnd("-arm64").TrimEnd("-a-windows10") |
Member
There was a problem hiding this comment.
A regex wouldn't be bad. I've seen some oddities with the current implementation (using installer.exe locally gives nstaller for the name). I think that doing that subsequently would be a good balance - clean up the behaviour but unblock usage.
Member
|
@swift-ci please smoke test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Currently, this expects a string like "swift-DEVELOPMENT-SNAPSHOT-2025-11-03-a-windows10" but arm64 builds also have a "-arm64" tacked on.
.TrimEnd("-arm64")is a no-op on the x64 version, so I figured better to do it this way than a messy regex or conditions.