initial integration of registry dependencies #3863
Conversation
|
@swift-ci please smoke test |
|
@swift-ci please smoke test |
Sources/PackageGraph/PinsStore.swift
Outdated
| location = url.absoluteString | ||
| case .registry: | ||
| kind = .registry | ||
| location = "" |
There was a problem hiding this comment.
nil is more appropriate but it's probably a big change to make location optional?
There was a problem hiding this comment.
yes, I will also add a FIXME here as we may need to revisit this
Sources/Workspace/Workspace.swift
Outdated
| let downloadPath = self.location.registryDownloadDirectory.appending(components: package.identity.description, version.description) | ||
| if !self.fileSystem.exists(downloadPath) { | ||
| _ = try temp_await { | ||
| registryManager.downloadSourceArchive( |
There was a problem hiding this comment.
Will need to pass workspace.checksumAlgorithm
|
@swift-ci please smoke test |
tomerd
force-pushed
the
feature/registry-01
branch
from
f2db564 to
d291a81
Compare
|
@swift-ci please smoke test |
tomerd
added
the
ready
|
@yim-lee rebased on your changes ptal |
| components?.appendPathComponents("\(scope)", "\(name)", "\(version)", "Package.swift") | ||
|
|
||
| if let swiftLanguageVersion = swiftLanguageVersion { | ||
| if let toolsVersion = toolsVersion { |
There was a problem hiding this comment.
So it's the tools version, not Swift version?
There was a problem hiding this comment.
yes, it should be tools version based afaik
| version: version, | ||
| revision: nil, | ||
| toolsVersion: .currentToolsVersion, | ||
| toolsVersion: toolsVersion ?? .currentToolsVersion, |
There was a problem hiding this comment.
Can we remove the FIXME on L180 then?
There was a problem hiding this comment.
this is still not working quite right, and looks like it may require larger change :/
| XCTAssertEqual(manifest.swiftLanguageVersions, [.v4, .v5]) | ||
| } | ||
|
|
||
| // FIXME: this fails with error "the package manifest at '/Package.swift' cannot be accessed (/Package.swift doesn't exist in file system)" |
There was a problem hiding this comment.
Can we uncomment the test?
There was a problem hiding this comment.
tried to fix it but this is still not working correctly. i plan to address in a separate pr to control scope of this one
| } | ||
|
|
||
| try temp_await { | ||
| registryManager.downloadSourceArchive( |
motivation: support registry dependencies changes: * make PinStore::state more generic (instead of CheckoutState) so it can handle non-checkout dependencies state * clean up CheckoutState and move it to the Workspace module where it belongs * wire calls to fetch and delete registry dependencies as part of dependency resolution in Workspace * adjust call-sites tests
tomerd
force-pushed
the
feature/registry-01
branch
from
7105157 to
5f99c14
Compare
tomerd
force-pushed
the
feature/registry-01
branch
from
5f99c14 to
e0e29cf
Compare
|
@swift-ci please smoke test |
3 participants
motivation: support registry dependencies
changes: