Skip to content

Merge main into release/6.2 #532

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 19 commits into from
May 28, 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.

cwakamo and others added 19 commits May 15, 2025 17:14
… right number of targetStarted events.

This is to aid with debugging the issue that resulted in a revert of f97263c.
Eliminate the maintenance burden of having to manually maintain this list. Also, it wasn't correct for Android and QNX anyways, since those don't actually have deployment target environment variables recognized by clang.

rdar://91377944
Added a new test of the SwiftBuildMessage stream to ensure we get the right number of targetStarted events.
Fix quadratic behavior when GenericOutputParser is written to many times per line
Swift Build currently has support for building C/C++ code on Android; this extends it to Swift.

Concretely, this fixes the position of the version number in the triple passed to swiftc for Android targets, and adds the relevant search paths to find Swift standard libraries and other content in the Swift SDK.

The sysroot still comes from an Android NDK found on the system; the sysroot in the Swift SDK is ignored based on the intended direction around supporting Android targets in Swift.
…es aren't deduplicated

This can happen if the Swift Driver plans the same job in two different builds, but specifies
a differtent set of input dependencies which either remove up to date jobs or add out of date ones.
Without this change, this could rarely lead to looking up the wrong set of or nonexistent input jobs
in an incremental build following a failed or cancelled one
Ensure swift jobs with the same command line but different dependenci…
The "swiftlang" version was only being used in a single location for a
compatibility check that is no longer required. The clang version was
unusued (which is unsurprising since it's often not available from the
Swift `--version` output). Really we only need the version itself and a
unique tag to pass as additional signature data to Swift tasks.
Document setting for allowing use of explicit modules with c++ interop
PlannedSwiftDriverJob - fix deserializer count
Implement __SKIP_BUILD setting to prune test runners from builds for apple platforms
Mark explicitBuildDescriptionID test as flaky
@owenv
Copy link
Collaborator

owenv commented May 28, 2025

@swift-ci test

@owenv
Copy link
Collaborator

owenv commented May 28, 2025

@swift-ci test linux

@owenv owenv marked this pull request as ready for review May 28, 2025 16:37
@owenv owenv merged commit 5684bd7 into release/6.2 May 28, 2025
4 checks passed
@owenv owenv deleted the automerge/merge-main-2025-05-28_16-25 branch May 28, 2025 17:01
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.

4 participants