6.2 merge main 0602 #8754
Merged
6.2 merge main 0602 #8754
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…g#8449) ### Motivation: Some of the `SwiftBuildSupport/PIFBuilder.swift` encoding/decoding code was using unsafe string keys. This replaces with proper typesafe keys. This part of the ground work to support the new PIF builder in `SwiftBuildSupport` (i.e., rdar://147527170). ### Modifications: When conforming to `Codable`, replace string keys with `enum` based keys instead. ### Result: The resulting code is a tad safer and easier to understand :-) Tracked by rdar://148546582.
…wiftlang#8441) ### Motivation: The goal is to adopt the new `SwiftBuild.ProjectModel` API. This new API provides a *typesafer* and *modern* way of building PIFs programmatically. This continues the work I started in PR swiftlang#8405, introducing now our new PIF builder for packages. ### Modifications: Replaces all `SwiftBuild.PIF` (aka, `SWBProjectModel.PIF`) API usage, in `PackagePIFBuilder`, with the new `SwiftBuild.ProjectModel` API instead. ### Result: `PackagePIFBuilder` is now modernized... but still not actually used. This will come in my next pull request. Tracked by rdar://147526957.
Some tests in Tests/SourceControlTests are passing on Windows since upgrading the Git Version in the associated docker image, which was completd in https://github.com/swiftlang/swift-docker/pulls/452 Enable the tests that are skipped. Relates to: swiftlang#8433 rdar://148248105
…swiftlang#8462) This updates and clarifies the [Version-specific Manifest Selection](https://github.com/swiftlang/swift-package-manager/blob/main/Documentation/Usage.md#version-specific-manifest-selection) section of the usage documentation to clarify the behavior when having either newer or older tools versions. ### Motivation: In general, when using the versioned manifest feature, it's preferable to have the unversioned `Package.swift` represent the newest-supported tools version, and only use version-specific manifest files for older versions. This provides a better workflow because it allows you to more easily drop support for older versions when ready (by avoiding the need to modify the unversioned file), among other benefits. ### Modifications: - "Reverse" the example shown in this documentation by having the unversioned file be newest. - Modernize the version numbers shown in examples. - Fix some non-inclusive language usages. - Add a footnote with some helpful historical context, and giving a recommendation.
Enable WorkspaceTests on Windows that, for some reason, previously failed. Relates: swiftlang#8433 rdar://148248105
Enable additional tests on Windows host platform
- Enable a few `AsyncProcessTests`
- Enable the lone skipped test in `EnvironmentTests`
- Enable the only skipped test in
`Tests/SourceKitLSPAPITests/SourceKitLSPAPITests.swift`
- Enable the only skipped test in
`Tests/BuildTests/BuildSystemDelegateTests.swift`
- Enable the lone skipped test in
`Tests/BuildTests/LLBuildManifestBuilderTests.swift`
- Replace usages of `fixwin` with `AbsolutePath.pathString`
Related to: swiftlang#8433
rdar://148248105
Remove hardcoded WASI sysroot path derivation just for wasi-sysroot embedded in toolchains ### Motivation: The previous implementation assumed there is $TOOLCHAIN_ROOT/share/wasi-sysroot when `--triple wasm32-unknown-wasi` is passed, but this is no longer the case with the [deprecation of the Wasm toolchain installation](swiftwasm/swift#5604) in favor of Swift SDKs. Due to this unnecessary branch, when `--triple wasm32-unknown-wasi` is passed together with `--swift-sdk`, `--swift-sdk` is just ignored: swiftlang#8465 ### Modifications: This change removes the hardcoded path derivation for the WASI sysroot from the `SwiftSDK.deriveTargetSwiftSDK` method. ### Result: When `--triple wasm32-unknown-wasi` is passed without `--swift-sdk`, no user visible change and they will keep getting the following: ``` error: emit-module command failed with exit code 1 (use -v to see invocation) <unknown>:0: warning: libc not found for 'wasm32-unknown-wasi'; C stdlib may be unavailable <unknown>:0: error: unable to load standard library for target 'wasm32-unknown-wasi' ``` When `--triple wasm32-unknown-wasi` is passed together with `--swift-sdk`, `--triple` is ignored and `--swift-sdk` is respected.
Until swiftlang#8223 is fixed copy some helpers from `IntergrationTests/Source/IntegrationTests` to `Test/_InternalTestSupport` so we can re-use the functionality. Related to: swiftlang#8433 rdar://148248105
…8472) We were including flags to hook up modulemaps and include files to C library dependencies in macros and plugin tools through to the modules that depend on those. This adds the capability to prune the depth first searches through the dependencies to ensure these are skipped when crossing macro and plugin boundaries.
Until swiftlang#8223 is fixed copy some helpers from `IntergrationTests/Source/IntegrationTests` to `Test/_InternalTestSupport` so we can re-use the functionality. Related to: swiftlang#8433 rdar://148248105 Test with: swiftlang/swift#80717
Fixed up incorrect wording: 1. Wasm is not an acronym, thus it's not uppercased [per the spec](https://webassembly.github.io/spec/core/intro/introduction.html#wasm). 2. Existing Swift SDKs support only WASI, while WASI-less Wasm modules can be created with Embedded Swift and Swift SDKs are not needed for that.
### Motivation: Ensure swiftpm bootstraps successfully to fully build an OpenBSD toolchain. ### Modifications: * Add the nobtcfi linker flag to the bootstrap script for OpenBSD. This is unconditional for now since swiftpm uses Concurrency liberally and this triggers #80059, so swiftpm only builds on the configuration where BTCFI is disabled. We can revisit some of that perhaps later. * Ensure SPMSQLite3 builds with the correct link library search path flag in CMakeLists.txt. * Update Package.swift conditionals for SPMSQLite3. ### Result: swiftpm successfully builds and bootstraps on OpenBSD.
The TestCommandTests fail on Linux due to a common linker problem with swift build build system, which is the missing 'main' symbol problem. This is described further detail in swiftlang#8439. Provide the link in the skip messages and remove the TODO tags since the investigation is complete and the reason for the failures is now known. Update the common test case logic so that it dumps the command execution stdout and stderr in the case of failure to help diagnose these result.xml failures immediately in the logs.
### Motivation: Pull request swiftlang#8476 was breaking SwiftPM builds in Xcode (i.e., the _package resolution_ step): <img src="https://github.com/user-attachments/assets/2424e52c-1198-45c2-aa82-68c73ef5e9d6" width=600/> ### Modifications: This reverts commit 1d48e0a.
Split the SerializedJSONTests into tests that pass and fail on Windows Related: swiftlang#8433 rdar://148248105
### Motivation:
This improves a bit the error/warning output when building with the new
`--build-system swiftbuild`.
This was the current output:
```shell
warning: unknown Enabling the Swift language feature 'MemberImportVisibility' is recommended; set 'SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES' []
error: path("/Users/pmattos/Development/SampleProjects/SamplePackages/PackageAccessCLI/Sources/ExampleApp/main.swift", fileLocation: Optional(SwiftBuild.SwiftBuildMessage.DiagnosticInfo.Location.FileLocation.textual(line: 6, column: Optional(5)))) cannot find 'bar' in scope []
```
...and this is the improved one:
```shell
warning: Enabling the Swift language feature 'MemberImportVisibility' is recommended; set 'SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES'
error: /Users/pmattos/Development/SampleProjects/SamplePackages/PackageAccessCLI/Sources/ExampleApp/main.swift:5:5 cannot find 'foo2' in scope
```
Eventually, we should consider adopting the error output style from the
`--build-system native` instead, i.e.:
```shell
/Users/pmattos/Development/SampleProjects/SamplePackages/PackageAccessCLI/Sources/ExampleApp/main.swift:5:5: error: cannot find 'foo2' in scope
3 | print("Hello, world!")
4 |
5 | _ = foo2()
| `- error: cannot find 'foo2' in scope
6 | _ = bar()
7 |
```
### Modifications:
These formatting changes are strictly local to the new
`SwiftBuildSupport` target.
### Result:
Slightly better error formatting :-)
The Swift toolchain installation on swift.org indicate to use swiftly to install the toolchain on macOS and Linux. Update the CONTRIBUTING.md file to refer to swiftly for toolchain management.
I had mucked with the fix to finish some testing and forgot to put the fix back. And the test didn't properly catch that. Fixing both.
…ystem (swiftlang#8421) - this also fixes -enable-library-evolution when used as a unsafeFlags Closes: swiftlang#8337 ### Modifications: sets SWIFT_EMIT_MODULE_INTERFACE build setting when option is set ### Result: the build option will include the .swftinertface files in the module folder
This PR adds support for the `--attachments-path` CLI argument on `swift test` as approved in [ST-0009](https://github.com/swiftlang/swift-evolution/blob/main/proposals/testing/0009-attachments.md). We will maintain support for the older `--experimental-attachments-path` version through Swift 6.2. The implementation of this option is held entirely in Swift Testing at this time, so no actual code is needed to support it, we just need to make sure Swift Argument Parser doesn't complain about it. Resolves rdar://147753584. @plemarquand has integration tests but they're blocked on a newer toolchain; unit testing of this argument exists in the Swift Testing repo.
### Motivation: When running tests ensure the *test fixtures* we copy over to temporary directories don't carry over any previous build information. ### Modifications: When copying packages from `/Fixtures/**` we now ensure we delete any `.build` or `.swiftpm` directories, if any.
Reverts swiftlang#8498 Broke swift-foundation build.
### Motivation: Switch from the legacy PIF builder in `SwiftBuildSupport` to the new one, introduced by PR swiftlang#8405. The new PIF builder (i.e., `SwiftBuildSupport/PackagePIFBuilder*.swift`) is the exact same we use in Xcode. ### Modifications: Replaces the old PIF builder (i.e., `SwiftBuildSupport/PIF.swift` and `SwiftBuildSupport/PIFBuilder.swift` ) with the new one (i.e., `SwiftBuildSupport/PackagePIFBuilder*.swift`). ### Result: The new PIF builder now fully replaces the legacy PIF builder. In particular, all these Swift Build tests are passing (i.e., same as before this PR): * BuildPlanSwiftBuildTests * APIDiffSwiftBuildTests * BuildCommandSwiftBuildTests * PackageCommandSwiftBuildTests * RunCommandSwiftBuildTests * TestCommandSwiftBuildTests I also improved the PIF logging too. Try the `--very-verbose` option to see what I mean :-) Tracked by rdar://147527170.
### Motivation:
Reduce noise from solvable warnings.
### Modifications:
We should `throw XCTSkip("...")` but `try XCTSkipIf(true, "...")`.
The BuildCommandTests was mixing both (i.e., `try XCTSkip("...")`),
making the test a nop actually.
This encodes our indentation size and line ending preferences and such. This is an exact copy of the .editorconfig in swift-build, which uses the same conventions.
We are seeing hangs in swift test on Windows. Instead of build-using-self using the underlying toolchain, build swift-test and use that for the tests. When we make improvements to it to fix the underlying problem, we will be able to take advantage of that fix right away.
…ftlang#8695) Enable generating the compatibility header for library targets on all platforms by lifting the restriction to Darwin. As part of the work to formalize `@cdecl` we've been adding content to the compatibility header that is usable by C compilers without the need for Objective-C or modules. Lifting this restriction will allow Linux and Windows users to generate and import the compatibility header to call `@cdecl` functions in their package.
As it turns out, contrary to an old comment in the diagnostic deserializer, the Swift compiler *does* serialize the offset of a source location, so stop assuming that it may have been left blank. This slightly simplifies the diagnostic conversion logic and also enables us to stop hashing the line and column in the diagnostic filter.
…ing failures (swiftlang#8724) Until we get https://github.com/swiftlang/swift-evolution/blob/main/proposals/0487-extensible-enums.md or a similar mechanism, add some redundant default clauses so that changes like swiftlang/swift-build#526 can be staged in without revlock.
…ugins (swiftlang#8728) This will activate build tool plugins and enables more plugin testing with the new build system.
Amendment to swiftlang#8696 which computes the correct path on Windows and FreeBSD, which use different install layouts from the other platforms.
) When SwiftPM executes tests using the native build system, the bundle path was failing on MacOS as the `Bundle.allBundles` did not contain the `.xctest` bundle. If we fail to find the .xctest bundle, we inspect the command line argument for the `--test-bundle-path` argument and construct the macOS bundle root based on the argument value. In addition, convert the StaticBinaryLibraryTests to Swift Testing to validate the logic works.
…#8740) In order to associate what prebuilt artifact goes with what package, add the `PackageIdentity` as a parameter to the delegate methods for prebuilts on `WorkspaceDelegate`.
…g#8726) Fixes swiftlang#8591 Ports the contents of `Documentation/PackageSecurity.md` to our DocC catalog in `Sources/PackageManagerDocs/PackageSecurity.md`.
Fixes swiftlang#8594 Port the contents of `Documentation/libSwiftPM.md` over to our DocC catalog in `Sources/PackageManagerDocs/Documentation.docc/SwiftPMAsALibrary.md`.
…tlang#8747) * Add disable-able sandboxing to the custom tasks in the PIF with the declared input and output files. * Add more test coverage of plugin scenarios * Capture child diagnostics from Swift Build and emit those through equivalent observability scope in SwiftPM
SwiftPM currently only detects Embedded Swift set via a swift settings and uses this to enable/disable a couple features. This is nice, but doesn't handle the case where Embedded is enabled via a user flag, typically set in a toolset.json. This commit updates the logic to also search for "-enable-experimental-feature Embedded" in the various place user flags can be placed.
Take advantage of the fact we're in swiftpm and calculate things out of the package graph instead of hard coding. In particular, we compute the list of targets for the requested list of products, as well as the list of C modules and their include paths. Swift build is better at ensuring the include path is added to all targets that need it. Unfortunately when mixing libraries that use swift-syntax and macros, we end up adding both the C modules from the checkouts and the prebuilts causing duplicate definition of the C modules. By adding the above include paths and leveraging that we always checkout the source anyway, switch to using the checked out include paths, thus avoiding the duplicate. Also some prep for adding a config.json file so the list of prebuilts can be changed without a PR to SwiftPM. Removes the magic we were using to add the prebuilt library to the package manifest and just add them at the end.
dschaefer2
requested review from
jakepetroules,
shawnhyam,
bripeticca,
plemarquand,
owenv,
bkhouri,
cmcgee1024 and
daveyc123
as code owners
|
Updated to remove cruft from the merge. |
bripeticca
approved these changes
Jun 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge main at 4dce989 using
git merge -X theirs origin/maingit diff origin/main HEADis minimal.