Skip to content

Conversation

@rmarinho
Copy link
Member

Description of Change

Try fix the simulator install

Copilot AI review requested due to automatic review settings October 21, 2025 13:35
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR attempts to fix iOS simulator installation issues in the CI pipeline by adding conditional logic for Xcode 26.0. The change ensures that the correct simulator version is installed based on the Xcode version being used.

Key Changes:

  • Added conditional logic to handle iOS simulator installation for Xcode 26.0 specifically
  • Added comments explaining the version-specific requirement

@rmarinho
Copy link
Member Author

/backport to release/10.0.1xx

@github-actions
Copy link
Contributor

Started backporting to release/10.0.1xx: https://github.com/dotnet/maui/actions/runs/18697576534

@github-actions
Copy link
Contributor

@rmarinho backporting to "release/10.0.1xx" failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: tweak
Using index info to reconstruct a base tree...
M	eng/pipelines/common/provision.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/common/provision.yml
CONFLICT (content): Merge conflict in eng/pipelines/common/provision.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 tweak
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@rmarinho rmarinho merged commit c866e4c into net10.0 Oct 21, 2025
154 of 166 checks passed
@rmarinho rmarinho deleted the try-update-xcode branch October 21, 2025 21:11
rmarinho added a commit that referenced this pull request Oct 21, 2025
* tweak

* delete all simulator runtimes if failing to install one

---------

Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
# Conflicts:
#	eng/pipelines/common/provision.yml
rmarinho added a commit that referenced this pull request Oct 22, 2025
* tweak

* delete all simulator runtimes if failing to install one

---------


# Conflicts:
#	eng/pipelines/common/provision.yml

Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants