move toolchain: preserve .exe extension for windows #16218
Merged
Conversation
This file contains 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
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
3 Ignored Deployments
|
rvantonder
commented
Feb 13, 2024
| let platform = detect_platform(&root, compiler_version, &dest_canonical_path)?; | ||
| if platform == "windows-x86_64" { | ||
| dest_canonical_binary.push(CANONICAL_WIN_BINARY_NAME); | ||
| } else { | ||
| dest_canonical_binary.push(CANONICAL_UNIX_BINARY_NAME); | ||
| } | ||
|
|
||
| if !dest_canonical_binary.exists() { | ||
| // Check the platform and proceed if we can download a binary. If not, the user should follow error instructions to sideload the binary. | ||
| let mut platform = detect_platform(&root, compiler_version, &dest_canonical_binary)?; |
There was a problem hiding this comment.
With this change we have to detect_platform before checking if the binary exists.
There's a method here close to the previous check where we can do "does binary exist?" by checking whether either sui or sui.exe exists. But with this PR though, we have to reuse knowledge of the platform to also invoke either sui or sui.exe depending on the platform. So I think it's more natural to get the platform and have the logic case out on that, than guess and persist sui vs sui.exe
rvantonder
force-pushed
the
rvt/win-exe
branch
from
5ee9f87 to
c8b0866
Compare
rvantonder
force-pushed
the
rvt/win-exe
branch
from
c8b0866 to
f398546
Compare
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.
Description
Toolchain versioned builds on windows will use
sui.exeand invokesui.exerather than justsuiso that windows users don't need to strip the.exeextension in order for things to work.(from #16182 (comment))
Test Plan
👀
If your changes are not user-facing and do not break anything, you can skip the following section. Otherwise, please briefly describe what has changed under the Release Notes section.
Type of Change (Check all that apply)
Release notes