Skip to content
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.

Sign up for GitHub

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

Jump to bottom

gh-130025: Correct handling of symlinks during iOS testbed framework installation. #130026

Merged
merged 1 commit into from
Feb 13, 2025
Merged

gh-130025: Correct handling of symlinks during iOS testbed framework installation. #130026

merged 1 commit into from
Feb 13, 2025

Conversation

freakboy3742
Copy link
Contributor

@freakboy3742 freakboy3742 commented Feb 12, 2025 •
edited by bedevere-app bot
Loading

Corrects the handling of symlinks when the iOS testbed clones a new project:

  1. Locations to source are resolved before use in the clone call.
  2. Use of resolve is dropped from the evaluation of xc_framework_path and sim_framework_path. If the XCframework/framework is a symlink, we don't want to resolve the symlink to it's final location (as it may not exist)
  3. If the XCframework on sim framework doesn't exist at all, the unlink is now a no-op.
  4. If no framework is specified, but the existing framework is a relative symlink, it is re-written relative to the new framework location (and similarly for the simulator framework).

@freakboy3742 freakboy3742 changed the title Correct handling of symlinks during iOS testbed framework installation. gh-130025: Correct handling of symlinks during iOS testbed framework installation. Feb 12, 2025
@bedevere-app bedevere-app bot mentioned this pull request Feb 12, 2025
Closed
@freakboy3742
Copy link
Contributor Author

This needs to be tested on the iOS buildbot, but the buildbot is currently offline for maintenance.

@freakboy3742 freakboy3742 added 3.13 bugs and security fixes OS-ios 3.14 new features, bugs and security fixes needs backport to 3.13 bugs and security fixes labels Feb 12, 2025
@picnixz picnixz removed 3.13 bugs and security fixes 3.14 new features, bugs and security fixes labels Feb 12, 2025
@freakboy3742
Copy link
Contributor Author

!buildbot iOS

@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @freakboy3742 for commit 5ffdbf6 🤖

The command will test the builders whose names match following regular expression: iOS

The builders matched are:

  • iOS ARM64 Simulator PR

@freakboy3742
Copy link
Contributor Author

Buildbot is back online (for now at least... there will likely be some more maintenance in the near future) - but I can at least confirm the testbed still works in CI with this change.

ned-deily
ned-deily approved these changes Feb 13, 2025
View reviewed changes
Copy link
Member

@ned-deily ned-deily left a comment

Choose a reason for hiding this comment

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

LGTM (without actually testing)

@freakboy3742 freakboy3742 merged commit 625470a into python:main Feb 13, 2025
58 checks passed
@miss-islington-app
Copy link

Thanks @freakboy3742 for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Feb 13, 2025
@freakboy3742 @miss-islington
pythongh-130025: Correct handling of symlinks during iOS testbed fram…
3cf11f4 
…ework installation. (pythonGH-130026)

Correct handling of symlinks during iOS testbed framework installation.
(cherry picked from commit 625470a)

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
@bedevere-app
Copy link

bedevere-app bot commented Feb 13, 2025

GH-130073 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Feb 13, 2025
@freakboy3742 freakboy3742 deleted the ios-testbed-symlink branch February 13, 2025 06:07
freakboy3742 added a commit that referenced this pull request Feb 13, 2025
@miss-islington @freakboy3742
[3.13] gh-130025: Correct handling of symlinks during iOS testbed fra…
32158ea 
…mework installation. (GH-130026) (#130073)

Correct handling of symlinks during iOS testbed framework installation.
(cherry picked from commit 625470a)

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
@freakboy3742 freakboy3742 mentioned this pull request Feb 13, 2025
Merged
4 tasks
freakboy3742 added a commit to beeware/Python-Apple-support that referenced this pull request Feb 13, 2025
@freakboy3742
Bump patch to Python3.14.0a5. (#247)
a2c04c3 
Update Python to 3.14.0a5.

Also includes:

* python/cpython#130026 testbed symlink handling
* LibFFI 3.4.7
* OpenSSL 3.0.16
* XZ 5.6.4
freakboy3742 added a commit to freakboy3742/cpython that referenced this pull request Feb 18, 2025
@freakboy3742
pythongh-130025: Correct handling of symlinks during iOS testbed fram…
3634b21 
…ework installation. (python#130026)

Correct handling of symlinks during iOS testbed framework installation.
freakboy3742 added a commit to freakboy3742/cpython that referenced this pull request Feb 18, 2025
@miss-islington @freakboy3742
[3.13] pythongh-130025: Correct handling of symlinks during iOS testb…
f1986e1 
…ed framework installation. (pythonGH-130026) (python#130073)

Correct handling of symlinks during iOS testbed framework installation.
(cherry picked from commit 625470a)

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
@hugovk
Copy link
Member

hugovk commented Feb 28, 2025

@python/organization-owners Please block @mfxrhxn for abuse (see also #128450 (review)).

I also reported them to GitHub.

freakboy3742 added a commit to freakboy3742/cpython that referenced this pull request Mar 16, 2025
@miss-islington @freakboy3742
[3.11] pythongh-130025: Correct handling of symlinks during iOS testb…
a5768e5 
…ed framework installation. (pythonGH-130026) (python#130073)

Correct handling of symlinks during iOS testbed framework installation.
(cherry picked from commit 625470a)

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
freakboy3742 added a commit to freakboy3742/cpython that referenced this pull request Mar 16, 2025
@miss-islington @freakboy3742
[3.10] pythongh-130025: Correct handling of symlinks during iOS testb…
037946d 
…ed framework installation. (pythonGH-130026) (python#130073)

Correct handling of symlinks during iOS testbed framework installation.
(cherry picked from commit 625470a)

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
freakboy3742 added a commit to freakboy3742/cpython that referenced this pull request Mar 16, 2025
@miss-islington @freakboy3742
[3.9] pythongh-130025: Correct handling of symlinks during iOS testbe…
ed3490f 
…d framework installation. (pythonGH-130026) (python#130073)

Correct handling of symlinks during iOS testbed framework installation.
(cherry picked from commit 625470a)

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ned-deily ned-deily ned-deily approved these changes

Assignees
No one assigned
Labels
OS-ios
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@freakboy3742 @bedevere-bot @hugovk @ned-deily @picnixz