Skip to content

fix package.resolved interplay with mirrors #3447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 27, 2021

Conversation

tomerd
Copy link
Contributor

@tomerd tomerd commented Apr 27, 2021

motivation: mirror urls leak today to package.resolved

changes:

  • add storage for "original urls" in the pins store
  • pass the mirors to the pins file handler
  • transform the url when encoding and decoding the pins store such that the package.resolved file contains the non-mirrored URL but SwiftPM internals work witht mirrored ones
  • adjust call-sites
  • add and adjust tests

rdar://52529014
rdar://52529011

motivation: mirror urls leak today to package.resolved

changes:
* add storage for "original urls" in the pins store
* pass the mirors to the pins file handler
* transform the url when encoding and decoding the pins store such that the package.resolved file contains the non-mirrored URL but SwiftPM internals work witht mirrored ones
* adjust call-sites
* add and adjust tests

rdar://52529014
rdar://52529011
@tomerd
Copy link
Contributor Author

tomerd commented Apr 27, 2021

@swift-ci please smoke test

@tomerd
Copy link
Contributor Author

tomerd commented Apr 27, 2021

cc @weissi

@tomerd
Copy link
Contributor Author

tomerd commented Apr 27, 2021

PR failing on driver issues

/Users/buildnode/jenkins/workspace/swift-package-manager-with-xcode-self-hosted-PR-osx/branch-main/swiftpm/.build/checkouts/swift-driver/Sources/SwiftDriver/Jobs/Planning.swift:188:31: error: variable used within its own initial value
21:31:10       let emitModuleJob = try emitModuleJob()
21:31:10                               ^
21:31:10 [892/967] Compiling SwiftDriver PrebuiltModulesJob.swift
21:31:10 
/Users/buildnode/jenkins/workspace/swift-package-manager-with-xcode-self-hosted-PR-osx/branch-main/swiftpm/.build/checkouts/swift-driver/Sources/SwiftDriver/Jobs/Planning.swift:188:31: error: variable used within its own initial value
21:31:10       let emitModuleJob = try emitModuleJob()
21:31:10                               ^
21:31:10 [893/967] Compiling SwiftDriver PrintTargetInfoJob.swift
21:31:10 
/Users/buildnode/jenkins/workspace/swift-package-manager-with-xcode-self-hosted-PR-osx/branch-main/swiftpm/.build/checkouts/swift-driver/Sources/SwiftDriver/Jobs/Planning.swift:188:31: error: variable used within its own initial value
21:31:10       let emitModuleJob = try emitModuleJob()
21:31:10                               ^
21:31:10 [894/967] Compiling SwiftDriver ReplJob.swift
21:31:10 
/Users/buildnode/jenkins/workspace/swift-package-manager-with-xcode-self-hosted-PR-osx/branch-main/swiftpm/.build/checkouts/swift-driver/Sources/SwiftDriver/Jobs/Planning.swift:188:31: error: variable used within its own initial value
21:31:10       let emitModuleJob = try emitModuleJob()
21:31:10                               ^
21:31:10 [895/967] Compiling SwiftDriver Toolchain+InterpreterSupport.swift
21:31:10 
/Users/buildnode/jenkins/workspace/swift-package-manager-with-xcode-self-hosted-PR-osx/branch-main/swiftpm/.build/checkouts/swift-driver/Sources/SwiftDriver/Jobs/Planning.swift:188:31: error: variable used within its own initial value
21:31:10       let emitModuleJob = try emitModuleJob()

cc @artemcm

@tomerd tomerd self-assigned this Apr 27, 2021
@weissi
Copy link
Contributor

weissi commented Apr 27, 2021

Yaaay, thanks. These are also known as

@tomerd
Copy link
Contributor Author

tomerd commented Apr 27, 2021

@swift-ci please smoke test macOS

@tomerd tomerd merged commit fee268f into swiftlang:main Apr 27, 2021
tomerd added a commit to tomerd/swift-package-manager that referenced this pull request Apr 27, 2021
motivation: mirror urls leak today to package.resolved

changes:
* add storage for "original urls" in the pins store
* pass the mirors to the pins file handler
* transform the url when encoding and decoding the pins store such that the package.resolved file contains the non-mirrored URL but SwiftPM internals work witht mirrored ones
* adjust call-sites
* add and adjust tests

rdar://52529014
rdar://52529011
tomerd added a commit that referenced this pull request Apr 28, 2021
motivation: mirror urls leak today to package.resolved

changes:
* add storage for "original urls" in the pins store
* pass the mirors to the pins file handler
* transform the url when encoding and decoding the pins store such that the package.resolved file contains the non-mirrored URL but SwiftPM internals work witht mirrored ones
* adjust call-sites
* add and adjust tests

rdar://52529014
rdar://52529011
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants