-
Notifications
You must be signed in to change notification settings - Fork 131
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.
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
Fixes iOS 18+ runtime downloads #391
Open
spadafiva
wants to merge
5
commits into
XcodesOrg:main
Choose a base branch
from
spadafiva:joe/download-xcode-18-runtimes
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Fixes iOS 18+ runtime downloads #391
spadafiva
wants to merge
5
commits into
XcodesOrg:main
from
spadafiva:joe/download-xcode-18-runtimes
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
spadafiva
changed the title
Gets downloads working a bit
Fixes iOS 18+ runtime downloads
Oct 24, 2024
spadafiva
commented
Oct 24, 2024
|
||
|
||
private extension Progress { | ||
func updateFromXcodebuild(text: String) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Taken directly from the other PR
spadafiva
commented
Oct 24, 2024
return AsyncThrowingStream<Progress, Swift.Error> { continuation in | ||
Task { | ||
// Assume progress will not have data races, so we manually opt-out isolation checks. | ||
let progress = Progress() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
More or less verbatim from the other PR
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.
This PR attempts to port the logic from XcodesOrg/XcodesApp#622 to the CLI tool.
Fixes #384
The logic in the
downloadAndInstallRuntime
was modified to now switch over the runtime's content type. The previous existing package and disk image installs were left unchanged, but the.cryptexDiskImage
case is now handled by thedownloadAndInstallUsingXcodeBuild
function.This function does 3 main things (broken into some smaller helper functions for those).
Testing:
In order to test this out you will need to have xcode 16.1 or newer installed.
Things I tested and seemed to work for me:
Caveats:
I'm not sure what happens to the underlying xcodebuild install process if you cancel the command from the terminal with CMD+C.
When the selected runtime is already installed, the tool will still go through the download process but complete quickly:
It might be worth following up in a future PR to check if the runtime is actually already installed instead of doing this.