generator/linux: copyTargetSwiftFromDocker does not need to call copyTargetSwift #160
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
…TargetSwift
copyTargetSwiftFromDocker() already copies all the same files as copyTargetSwift,
and puts them in the destination directory. Calling copyTargetSwift() at the
end just results in several pointless rsync calls which syncing directories to
themselves.
Stopping in copyTargetSwift() shows that the source and destination arguments
point to the same place:
Process 77272 stopped
* thread swiftlang#2, queue = 'com.apple.root.default-qos.cooperative', stop reason = breakpoint 1.1
frame #0: ... at SwiftSDKGenerator+Copy.swift:105:8
102 }
103 }
104
-> 105 func copyTargetSwift(from distributionPath: FilePath, sdkDirPath: FilePath) async throws {
106 logGenerationStep("Copying Swift core libraries for the target triple into Swift SDK bundle...")
107
108 for (pathWithinPackage, pathWithinSwiftSDK) in [
Target 0: (swift-sdk-generator) stopped.
(lldb) print distributionPath.string
(String) ".../ubuntu-jammy.sdk/usr"
(lldb) print sdkDirPath.string
(String) ".../ubuntu-jammy.sdk"
The first rsync command line is then:
rsync -a .../ubuntu-jammy.sdk/usr/lib/swift .../ubuntu-jammy.sdk/usr/lib
Removing the call to copyTargetSwift() does not save much time because rsync
does not do much work, however disentangling the Ubuntu-based SDK build from
the container-based build makes it easier to refactor both of them independently.
Diffing SDKs built before and after this change shows them to be identical.
The EndToEndTests (which currently can't be run by CI) continue to pass locally.
Contributor
Author
|
@swift-ci test |
euanh
changed the title
Contributor
Author
|
MaxDesiatov
approved these changes
Nov 28, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
copyTargetSwiftFromDocker()already copies all the same files ascopyTargetSwift(),and puts them in the destination directory. Calling
copyTargetSwift()at theend just results in several pointless rsync calls which sync the directories to
themselves.
Stopping in
copyTargetSwift()shows that the source and destination arguments point to the same place:The first rsync command line is then:
Removing the call to copyTargetSwift() does not save much time because rsync does not do much work, however disentangling the Ubuntu-based SDK build from the container-based build makes it easier to refactor both of them independently.
Diffing SDKs built before and after this change shows them to be identical. The EndToEndTests (which currently can't be run by CI) continue to pass locally.