Skip to content

Merge release/6.2 into main #623

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

Merged
merged 6 commits into from
Jun 30, 2025
Merged

Conversation

github-actions[bot]
Copy link

This PR was automatically opened by a GitHub action. Review the changes included in this PR and determine if they should be included in the release branch. If yes, merge the PR. Otherwise revert changes that should not be included on this branch.

jakepetroules and others added 6 commits June 23, 2025 12:11
…creen info.plist key when linked on or after v26 releases

rdar://142654612
Noticed this while working on some other tests; probably doesn't matter but may be confusing so correct it.
… library in a debug (unoptimized) build.

rdar://151724474
…rrectly when using a non-default Xcode toolchain (#606)

This resolves an issue which can occur when using Xcode 26 Beta with the downloadable Metal toolchain installed, if a target imports Swift Testing. A toolchain override is specified in this scenario, and this causes the existing logic modified by this PR to incorrectly believe it's using a non-Xcode toolchain, which in turn causes the wrong Swift macro plugin flags to be passed, ultimately leading to a failure locating the `TestingMacros` plugin.

The fix is to recognize all toolchains which have Xcode's prefix, and ensure the default toolchain prefix is used whenever any Xcode toolchain is in use.

Fixes rdar://152088164
@owenv
Copy link
Collaborator

owenv commented Jun 30, 2025

@swift-ci test

@owenv
Copy link
Collaborator

owenv commented Jun 30, 2025

@swift-ci test Linux

@owenv owenv marked this pull request as ready for review June 30, 2025 16:43
@owenv owenv merged commit 9612ab4 into main Jun 30, 2025
3 checks passed
@owenv owenv deleted the automerge/merge-main-2025-06-30_09-02 branch June 30, 2025 16:58
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.

5 participants