[6.0] Cherry-pick recent NFC changes to reduce merge conflicts #7721
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
`#if swift(<6.0)` is a wrong check to apply, since it has no effect with 6.0 compiler versions, unlike `#if compiler(<6.0)`. (cherry picked from commit 067136b)
…ng (#7660) ### Motivation: Trying to make it possible to share `createBuildOperation` between multiple implementations of `SPMCoreBuild.BuildSystem` in preparation to introduce an operation that would build plugin tools. ### Modifications: - Rename `BuildOperationBuildSystemDelegateHandler` into `LLBuildProgressTracker` which is a more neutral name that could be used by different llbuild operations if necessary. - Integrate `commandFailureHandler` into the progress tracker - Make `BuildOperation.createBuildSystem` stateless and use a single member to set both a new build system and its tracker. ### Result: The change it make it much easier to move `createBuildSystem` out of `BuildOperation` and into `SPMCoreBuild.BuildSystem` itself. (cherry picked from commit 9c0e48e)
#7667) …ildCommands, LLBuildDescription and LLBuildProgressTracker ### Motivation: There are 3 logically distinct things in this giant file which are better kept separate. ### Modifications: - Splits BuildOperationBuildSystemDelegateHandler.swift into 3 files - one for commands, one for build description and one for progress tracking. ### Result: Concerns are properly separated. (cherry picked from commit 8a4364c)
* Remove mention of `nil` name which is not allowed due to the parameters being non-optional. * Synchronize wording describing local package paths. (cherry picked from commit 83214f0) # Conflicts: # Sources/PackageDescription/PackageDependency.swift
The conformances are unused and pull in an additional `TSCUtility.PolymorphicCodableProtocol` dependency. This change removes about 0.2-0.4 MB from final executables on macOS when comparing with `swift build -c release` to `main`. Also allows us to rename these types more easily to disambiguate between host/target triples and manifest targets/modules in our code. If there's an existing user of this JSON manifest serialization we're unaware of, they should rely on `swift package describe --type json` instead, which has stable, consistent, and tested output. (cherry picked from commit 9e5f8b7) # Conflicts: # Sources/PackageModel/BuildSettings.swift # Sources/PackageModel/Manifest/PackageConditionDescription.swift
Cleaning up `PackageGraph` and `Build` code naming inconsistencies after `ResolvedTarget` to `ResolvedModule` renaming. User-visible strings and symbols still reference it as "target", but at least it's easier to navigate for contributors. `public` symbols gained deprecation notices where this was possible and easy to add. (cherry picked from commit e13a3aa) # Conflicts: # Sources/Build/BuildManifest/LLBuildManifestBuilder.swift # Sources/PackageGraph/ModulesGraph+Loading.swift # Sources/PackageGraph/ModulesGraph.swift # Sources/PackageGraph/Resolution/ResolvedPackage.swift # Sources/PackageLoading/ModuleMapGenerator.swift # Sources/SPMTestSupport/MockBuildTestHelper.swift # Sources/SPMTestSupport/MockWorkspace.swift # Sources/SourceKitLSPAPI/BuildDescription.swift # Tests/BuildTests/ClangTargetBuildDescriptionTests.swift # Tests/WorkspaceTests/WorkspaceTests.swift
Adds a new `Environment` type to replace TSCBasics EnvironmentVariables and ProcessEnvironmentBlock types. Updates points of use of the older APIs with the newer API and adds unit tests for `Environment`. (cherry picked from commit 74aea87)
We'd like to implement more changes to `TSCBasic.Process` without fearing of breaking clients, in addition to the fact that TSC is deprecated. One thing in particular we need is backpressure logic (coming in a future PR) when reading from process instances in plugins communication with the host SwiftPM process. Currently without this logic, a naive rewrite of plugins communication with structured concurrency is quite bug-prone, as it loses messages ordering and can quickly fill up all memory with resource-intensive plugins. Thus `TSCBasic.Process` is slightly cleaned up and is vendored as `AsyncProcess` in this change. We also give it more coverage in tests by utilizing `async` overloads, which are the overloads we should be using more in the structured concurrency conversion of the SwiftPM codebase. (cherry picked from commit b86d22e) # Conflicts: # Tests/CommandsTests/PackageCommandTests.swift # Tests/FunctionalTests/MiscellaneousTests.swift # Tests/FunctionalTests/PluginTests.swift # Tests/FunctionalTests/TraitTests.swift
|
@swift-ci test |
|
CI seems to be blocked on |
|
@swift-ci test |
bnbarham
approved these changes
Jun 27, 2024
MaxDesiatov
added
no functional change
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.
Includes these PRs cherry-picked off
mainPackageDependency.swift#7682Codableconformances onPackageModeltypes #7687AsyncProcess, make more testsasync#7679Explanation: Cherry-pick of recent NFC changes, which makes it easier to cherry-pick actual bug fixes onto 6.0 due to the reduced number of merge conflicts.
Scope: broad, includes both modules graph and llbuild-related changes.
Risk: low, the test suite is passing, no functional changes are included, and cherry-picked changes were incubated on
mainfor some time.Testing: Existing automated test suite.
Issue: N/A
Reviewers: @xedin @MaxDesiatov @rauhul