Skip to content

Merge release/6.4.x into main#10072

Draft
github-actions[bot] wants to merge 14 commits into
mainfrom
automerge/merge-main-2026-05-16_11-49
Draft

Merge release/6.4.x into main#10072
github-actions[bot] wants to merge 14 commits into
mainfrom
automerge/merge-main-2026-05-16_11-49

Conversation

@github-actions
Copy link
Copy Markdown

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.

bkhouri and others added 14 commits May 11, 2026 23:28
Now that SwiftPM on SwiftBuild is in a good shape, let's update the
GitHub actions to only build against the default build system.

SwiftBuild is the default on nightly-main, while the native build system
is the default on nightly 6.2.  The GitHub actions are still running
against nightly 6.2 to have the same environment as the Jenkins CI self
hosted pipeline equivalent.

Relates to #9427
Issue: rdar://165491718

(cherry picked from commit 89c6c4c)
Update the Package.swift dependencies to have their branch dependency be
`release/6.4.x`, to match the projects branch name.

Depends on: swiftlang/swift-build#1370
GHA: Simplify and reduce number of jobs
A Windows tests fails with Swift 6.2, but is fixed with Swift 6.3.
Update the withKnownIssue when bloc to reflect this
[6.4] Query the underlying build system when determining the build products dir
Allow the STRIP_INSTALLED_PRODUCT build setting in the Swift Build
settings to be configuration in SwiftPM.

Add an "enable/disable" build options that will sets the settings value
accordingly. When not set, the products are not stripped, matching the
native build system.

Fixes: #10037
Issue: rdar://176554583

Depends on: swiftlang/swift-build#1395
Swift Build does not suport testTarget that depend on another
testTarget, and the error produced was not clear.

This change modifies the PIF Builder to emit an error diagnostics when
it detects a testTarget depends on another testTarget.

Fixes: #10062
Issue: rdar://174431298
Comment thread Package.swift

/// When not using local dependencies, the branch to use for llbuild and TSC repositories.
let relatedDependenciesBranch = "main"
let relatedDependenciesBranch = "release/6.4.x"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Issue (blocking): we need to revert this change

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