Merge `main` into `release/6.3` #9510

github-actions · 2025-12-15T09:06:19Z

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.

Enable the Unacceptable language checks in the repository and update the code base to remove such laguage. Fixes: #9395 Issue: rdar://164975556

- this should allow us to consume available in the Pipe as its filled and flushed but the running process. rdar://155634107

- need library search path to ExecutableModules for windows

Update the PIF builder to take into account of the `--[auto|disable|enable]-index-store` command line option. When set to `auto`, the PIF builder behaviour does the same as the Native build system. Fixes: #9325 Issue: rdar://163961900

- this test seems to cause a crash in libcrypto rdar://134238535

Enable license header check in GitHub Actions to ensure all source files contain the appropriate license headers. Fixes: #9396 Issue: rdar://164975570

Remove placeholder line in WritingCommandPlugin.md. ### Motivation: The doc contains a meaningless placeholder line. ### Modifications: Removed the placeholder line. ### Result: Syntax errors are removed from demo code snippet.

Add a `swift package bsp` command which builds on the Swift Build BSP interface to provide preparation + compiler args for packages as an out of process build server.

The triple name in the SwiftBuild build system is redundant. Remove the triple from the output path.

Ensure we run the pipelines against SwiftBuild to give us extra confidence with the tooling Fixes: #9070

Update the SwiftPM's SwiftBuild integration to support enabling `address`, `thread` and `undefined` sanitizers while erroring out on the `scudo` and `fuzzer`. Fixes: #9322 Fixes: #8869 Depends on: swiftlang/swift-build#926 Depends on #9388

Provide the downloadable metal toolchain to swiftbuild using EXTERNAL_TOOLCHAINS_DIR env variable ### Motivation: #9202 [Parity] error: unable to spawn process 'metal' (No such file or directory) Requires CI to include Metal toolchain in order to enable Metal tests: #9443

It is causing the licence check CI job to fail.

Squashes the warnings in AsyncProcess by adjusting required callbacks to be `@Sendable`, marking lock protected state as `nonisolated(unsafe)` and using a `ThreadSafeBox` to capture the process result. Fixes up warnings in AsyncProcessTests as well.

Fixup licence header in DisableSigpipe.swift

Add an automated tests that validates SwiftBuild build system sets the dead code stip setting accordingly. Fixes: #9326 Issue: rdar://163962003

### Motivation: Ensures external clients (e.g., Xcode) can reuse some PIF GUID operations implemented internally by SwiftPM. Without this patch, clients were instead duplicating the exact same code externally. ### Modifications: For now, this is a quick fix to ensure that we reuse this single function from SwiftBuildSupport/PackagePIFBuilder+Helpers.swift static func targetGUID( forProductName name: String, withId id: String, suffix: TargetSuffix? = nil ) -> GUID Related to rdar://165063807.

…ading issue (#9483) I've seen these tests fail to load a build description in CI twice. Expand the issue criteria while I debug the root cause.

….yml Bumps [swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml](https://github.com/swiftlang/github-workflows) from 0.0.1 to 0.0.2. - [Release notes](https://github.com/swiftlang/github-workflows/releases) - [Commits](swiftlang/github-workflows@0.0.1...0.0.2) --- updated-dependencies: - dependency-name: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml dependency-version: 0.0.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

…esource bundle (#9486) This is required in order to ensure that package resource accessors are correctly generated for the testable variants Closes #9459 Depends on swiftlang/swift-build#967

This ensures that even if an artifact bundle is downloaded and unpacked without a file extension, the underlying build system can identify it correctly. Closes #9471 Depends on swiftlang/swift-build#962 I wasn't able to add a test for this because I can only reproduce it with remote packages

The versions without the `traits` parameter were public for clients to use, but the version with the `traits` parameter were marked as `package`. Expose them as `public` just like the versions without traits.

…xecutable product with a different name (#9480) If an executable target is combined with an executable product at the PIF layer, it must retain the target's module name, so that tests which consume it can import the right module name.

This PR refactors diagnostic handling in the Swift build system by introducing a dedicated message handler and per-task output buffering to properly parse and emit compiler diagnostics individually. ### **Key Changes** **SwiftBuildSystemMessageHandler** - Introduced a new dedicated handler class to process `SwiftBuildMessage` events from the build operation - Moved message handling logic out of inline nested functions for better organization and testability - Maintains build state, progress animation, and diagnostic processing in a single cohesive component **Per-Task Data Buffering** - Added `taskDataBuffer` struct in `BuildState` to capture compiler output per task signature - New `TaskDataBuffer` struct allows for using `LocationContext` or `LocationContext2` as a subscript key to fetch the appropriate data buffer for a task, defaulting to the global buffer if no associated task or target can be identified. - Task output is accumulated in the buffer as `.output` messages arrive - Buffer contents are processed when tasks complete, ensuring all output is captured before parsing - Failed tasks with no useful or apparent message will be demoted to an info log level to avoid creating too much noise on the output. **Per-Task Diagnostic Buffering** - Added `diagnosticBuffer` property to the `BuildState` to track diagnostics to emit once we receive a `taskComplete` event - A check is done to ascertain whether the diagnostic info we receive is a global/target diagnostic, and if so we emit the diagnostic immediately; all other diagnostics are accumulated in the buffer to be emitted once the associated task is completed. **EmittedTasks** - Helper struct for the message handler to track which task's messages have already been emitted - Handles both taskIDs as well as taskSignatures ### **Test Suite** **SwiftBuildSystemMessageHandlerTests** - New test suite created to assert that the diagnostic output is formatted and emitted as expected. - Uses the initializers for the nested `SwiftBuildMessage` info structs that are exposed for testing purposes only

…sue (#9481) The `InMemoryFilesSystemTests` were using `withKnownIssue` to validate that the file system was throwing errors when expected. This was polluting the test report with tests that appeared to have known issues, but were actually working as intended. Use `#expect(throws:)` to validate these functions are throwing the appropriate error as expected.

@test

Link Swift Testing documentation in its test template ### Motivation: This hopefully makes it easier for new users to find relevant documentation for our test framework! It also matches the existing pattern where XCTest documentation is linked in its respective test template. ### Modifications: - Add a link to Swift Testing documentation in the test template. - Trims some trailing whitespace. Realistically, I don't have much control over this since my editor is respecting the project's .editorconfig's `trim_trailing_whitespace = true` directive. I can manually put them back if that would be better. ### Result: Default Swift Testing template will include a comment linking to the developer docs. Testing it locally: ``` ~/scraps/autogen/xx.ZtJsA ❯ /Users/jerrychen/workspace/opensource/swift-package-manager/.build/arm64-apple-macosx/debug/swift-package init Creating library package: xx.ZtJsA Creating Package.swift Creating .gitignore Creating Sources Creating Sources/xx.ZtJsA/xx_ZtJsA.swift Creating Tests/ Creating Tests/xx.ZtJsATests/ Creating Tests/xx.ZtJsATests/xx_ZtJsATests.swift ~/scraps/autogen/xx.ZtJsA ❯ /bin/cat Tests/xx.ZtJsATests/xx_ZtJsATests.swift import Testing @testable import xx_ZtJsA @test func example() async throws { // Write your test here and use APIs like `#expect(...)` to check expected conditions. // Swift Testing Documentation // https://developer.apple.com/documentation/testing } ```

…cking operation (#9493) Use Task.detachNewThread here because buildSystem.build() is a blocking operation. Running this on the Swift Concurrency thread pool can block a worker thread potentially causing thread pool starvation and deadlocks. By running it on a dedicated thread, we keep the Swift Concurrency pool available for other async work. ### Motivation: #9441

…th (#9500) Don't rely on current working directory in BasicTests - use packagePath ### Motivation: Encountering race conditions with concurrent tests making use of current working directory. Removing usages.

Update the build-using-self to the `swift-build` and `swift-test` executable targets are built using the native build system. Fixes: #9070

…es) (#9505) Fix crashes on AL2 where tests where changing current working directory

jakepetroules · 2025-12-15T09:07:37Z

@swift-ci test

bkhouri · 2025-12-15T19:38:47Z

@swift-ci test

owenv · 2025-12-17T22:09:37Z

@swift-ci test macOS

owenv · 2025-12-17T22:09:45Z

@swift-ci test Linux

bkhouri and others added 30 commits December 5, 2025 10:50

Pipeline: Enable unacceptable language checks

6c2755d

Enable the Unacceptable language checks in the repository and update the code base to remove such laguage. Fixes: #9395 Issue: rdar://164975556

Change AsyncProcess stdout/err reads to 4096 instead of Int.max (#9408)

41f7eea

- this should allow us to consume available in the Pipe as its filled and flushed but the running process. rdar://155634107

Fix for linking tests with swiftbuild on windows (#9405)

cb587d2

- need library search path to ExecutableModules for windows

SwiftBuild: Add index store support

f269157

Update the PIF builder to take into account of the `--[auto|disable|enable]-index-store` command line option. When set to `auto`, the PIF builder behaviour does the same as the Native build system. Fixes: #9325 Issue: rdar://163961900

Mark purgeCacheInPackageDirectory withKnowIssue for AL2 (#9386) (#9400)

1845c6e

- this test seems to cause a crash in libcrypto rdar://134238535

GHA: Enforce license header check

592886b

Enable license header check in GitHub Actions to ensure all source files contain the appropriate license headers. Fixes: #9396 Issue: rdar://164975570

Remove placeholder line in WritingCommandPlugin.md (#9440)

5fd522f

Remove placeholder line in WritingCommandPlugin.md. ### Motivation: The doc contains a meaningless placeholder line. ### Modifications: Removed the placeholder line. ### Result: Syntax errors are removed from demo code snippet.

Expose a SwiftPM BSP interface based on Swift Build (#9129)

731f960

Add a `swift package bsp` command which builds on the Swift Build BSP interface to provide preparation + compiler args for packages as an out of process build server.

Fix test the broke build due to merge race (#9470)

4eb0097

Remove triple from SwiftBuild system output path (#9370)

ec5d66a

The triple name in the SwiftBuild build system is redundant. Remove the triple from the output path.

Fix warnings in Sources/Commands (#9425)

7c14274

Enable SwiftBuild in pipeline (#9406)

e645a74

Ensure we run the pipelines against SwiftBuild to give us extra confidence with the tooling Fixes: #9070

Fixup licence header in DisableSigpipe.swift

68d9aba

It is causing the licence check CI job to fail.

Merge pull request #9475 from plemarquand/fixup-licence-header

5f7cf54

Fixup licence header in DisableSigpipe.swift

Tests: Add automated tests to verify dead code strip

a5be296

Add an automated tests that validates SwiftBuild build system sets the dead code stip setting accordingly. Fixes: #9326 Issue: rdar://163962003

Add Dependabot configuration for GitHub Actions (#9482)

33f29da

Mark build server tests as flaky while debugging build description lo…

4e4db3d

…ading issue (#9483) I've seen these tests fail to load a build description in CI twice. Expand the issue criteria while I debug the root cause.

Ensure testable variants of targets depend on the primary variant's r…

7ee2e09

…esource bundle (#9486) This is required in order to ensure that package resource accessors are correctly generated for the testable variants Closes #9459 Depends on swiftlang/swift-build#967

Expose PackageDependency creation methods (#9484)

63047d9

The versions without the `traits` parameter were public for clients to use, but the version with the `traits` parameter were marked as `package`. Expose them as `public` just like the versions without traits.

Remove Ben Barham from code owners

96d7b55

plemarquand and others added 6 commits December 11, 2025 12:04

Don't rely on current working directory in BasicTests - use packagePa…

3af203f

…th (#9500) Don't rely on current working directory in BasicTests - use packagePath ### Motivation: Encountering race conditions with concurrent tests making use of current working directory. Removing usages.

Update build-using-self (#9496)

1fb32b5

Update the build-using-self to the `swift-build` and `swift-test` executable targets are built using the native build system. Fixes: #9070

Remove a couple areas where tests where changing cwd (fixes AL2 crash…

b60528e

…es) (#9505) Fix crashes on AL2 where tests where changing current working directory

bkhouri marked this pull request as ready for review December 15, 2025 19:38

bkhouri requested review from bkhouri, bripeticca, cmcgee1024, daveyc123, dschaefer2, jakepetroules, owenv, plemarquand and rconnell9 as code owners December 15, 2025 19:38

bkhouri enabled auto-merge December 15, 2025 19:38

bkhouri approved these changes Dec 15, 2025

View reviewed changes

bkhouri merged commit 37261f4 into release/6.3 Dec 18, 2025
9 checks passed

bkhouri deleted the automerge/merge-main-2025-12-15_09-06 branch December 18, 2025 06:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge `main` into `release/6.3` #9510

Merge `main` into `release/6.3` #9510

Uh oh!

github-actions bot commented Dec 15, 2025

Uh oh!

jakepetroules commented Dec 15, 2025

Uh oh!

bkhouri commented Dec 15, 2025

Uh oh!

owenv commented Dec 17, 2025

Uh oh!

owenv commented Dec 17, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

Merge main into release/6.3 #9510

Merge main into release/6.3 #9510

Uh oh!

Conversation

github-actions bot commented Dec 15, 2025

Uh oh!

jakepetroules commented Dec 15, 2025

Uh oh!

bkhouri commented Dec 15, 2025

Uh oh!

owenv commented Dec 17, 2025

Uh oh!

owenv commented Dec 17, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

Merge `main` into `release/6.3` #9510

Merge `main` into `release/6.3` #9510