Add swift-crypto dependency #3202

yim-lee · 2021-01-16T21:53:43Z

Motivation:
Upcoming package collections feature will require swift-crypto dependency.

Modifications:

Add swift-crypto dependency
Bump minimum macOS version to 10.15, for it's required by swift-crypto

yim-lee · 2021-01-16T21:54:34Z

@swift-ci please smoke test

yim-lee · 2021-01-17T18:06:02Z

@swift-ci please smoke test

yim-lee · 2021-01-17T23:16:11Z

Does this mean we need to add CMakeLists files to swift-crypto?

11:03:28 -- Check for working Swift compiler: /home/buildnode/jenkins/workspace/swift-package-manager-Linux-smoke-test/branch-main/build/buildbot_incremental/toolchain-linux-x86_64/usr/bin/swiftc
11:03:29 -- Check for working Swift compiler: /home/buildnode/jenkins/workspace/swift-package-manager-Linux-smoke-test/branch-main/build/buildbot_incremental/toolchain-linux-x86_64/usr/bin/swiftc -- works
11:03:29 CMake Error at CMakeLists.txt:50 (find_package):
11:03:29   Could not find a package configuration file provided by "Crypto" with any
11:03:29   of the following names:
11:03:29 
11:03:29     CryptoConfig.cmake
11:03:29     crypto-config.cmake
11:03:29 
11:03:29   Add the installation prefix of "Crypto" to CMAKE_PREFIX_PATH or set
11:03:29   "Crypto_DIR" to a directory containing one of the above files.  If "Crypto"
11:03:29   provides a separate development package or SDK, be sure it has been
11:03:29   installed.

abertelrud · 2021-01-19T18:16:24Z

Does this mean we need to add CMakeLists files to swift-crypto?

11:03:28 -- Check for working Swift compiler: /home/buildnode/jenkins/workspace/swift-package-manager-Linux-smoke-test/branch-main/build/buildbot_incremental/toolchain-linux-x86_64/usr/bin/swiftc
11:03:29 -- Check for working Swift compiler: /home/buildnode/jenkins/workspace/swift-package-manager-Linux-smoke-test/branch-main/build/buildbot_incremental/toolchain-linux-x86_64/usr/bin/swiftc -- works
11:03:29 CMake Error at CMakeLists.txt:50 (find_package):
11:03:29   Could not find a package configuration file provided by "Crypto" with any
11:03:29   of the following names:
11:03:29 
11:03:29     CryptoConfig.cmake
11:03:29     crypto-config.cmake
11:03:29 
11:03:29   Add the installation prefix of "Crypto" to CMAKE_PREFIX_PATH or set
11:03:29   "Crypto_DIR" to a directory containing one of the above files.  If "Crypto"
11:03:29   provides a separate development package or SDK, be sure it has been
11:03:29   installed.

Right, it looks as if swift-crypto isn't able to build with CMake. But is it needed for bootstrapping? CMake is only used in order to get a swift-build that can build itself. Would it be too convoluted to factor the dependency on swift-crypto so it isn't needed by swift-build itself?

tomerd · 2021-01-19T20:11:58Z

Right, it looks as if swift-crypto isn't able to build with CMake. But is it needed for bootstrapping? CMake is only used in order to get a swift-build that can build itself

I dont know that that is true for Windows (tho would be nice to have minimal pre step) @compnerd ?

Motivation: This is to support swiftlang/swift-package-manager#3202, which adds swift-crypto as a dependency to SwiftPM. Modifications: Add CMake files. Result: Can build swift-crypto with cmake.

finagolfin · 2021-01-21T16:53:42Z

Unless you plan on using these new crypto features when building SPM with itself, which shouldn't be necessary since build-script should have already checked out SPM's dependencies, I think it's fine to not add this swift-crypto dependency for the CMake bootstrap and avoid adding a CMake config for swift-crypto.

compnerd · 2021-01-22T02:44:06Z

Windows definitely relies on the CMake build to get a fully functional SPM. The manifest execution is a problem - there is no concept of rpath, and static linking for Swift modules is unsupported. We currently are reliant on CMake for the complete build.

Motivation: This is to support swiftlang/swift-package-manager#3202, which adds swift-crypto as a dependency to SwiftPM. Modifications: Add CMake files. Result: Can build swift-crypto with cmake.

finagolfin · 2021-01-22T05:34:37Z

Alright, I didn't know you weren't building SPM with SPM on Windows and are using the CMake-configured build of SPM instead on that platform.

Motivation: This is to support swiftlang/swift-package-manager#3202, which adds swift-crypto as a dependency to SwiftPM. Modifications: Add CMake files. Result: Can build swift-crypto with cmake.

neonichu · 2021-01-22T18:56:08Z

@yim-lee BTW, if we land swiftlang/swift#35507, we could use cross-repository testing together with the swift-crypto PR -- might be worth it to get a fully end-to-end test on CI before we land the changes in swift-crypto? Then maybe pinning a version in update-checkout could be a follow-up PR.

Motivation: This is to support swiftlang/swift-package-manager#3202, which adds swift-crypto as a dependency to SwiftPM. Modifications: Add CMake files. Result: Can build swift-crypto with cmake.

Motivation: This is to support swiftlang/swift-package-manager#3202, which adds swift-crypto as a dependency to SwiftPM. Modifications: Add CMake files. Result: Can build swift-crypto with cmake. Co-authored-by: Saleem Abdulrasool <[email protected]> Co-authored-by: Saleem Abdulrasool <[email protected]>

yim-lee · 2021-02-03T03:13:52Z

@swift-ci please smoke test

yim-lee · 2021-02-03T04:47:10Z

Build error seems unrelated:

/home/buildnode/jenkins/workspace/swift-package-manager-Linux-smoke-test/branch-main/swift-driver/Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraph.swift:938:86: error: 'SwiftDeps' is not a member type of class 'SwiftDriver.ModuleDependencyGraph'
20:05:02 extension BidirectionalMap where T1 == TypedVirtualPath, T2 == ModuleDependencyGraph.SwiftDeps {
20:05:02                                                                ~~~~~~~~~~~~~~~~~~~~~ ^
20:05:02 /home/buildnode/jenkins/workspace/swift-package-manager-Linux-smoke-test/branch-main/swift-driver/Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraph.swift:20:39: note: 'ModuleDependencyGraph' declared here
20:05:02 /*@_spi(Testing)*/ public final class ModuleDependencyGraph {
20:05:02                                       ^
20:05:02 /home/buildnode/jenkins/workspace/swift-package-manager-Linux-smoke-test/branch-main/swift-driver/Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraph.swift:923:7: error: cannot find 'sourceSwiftDepsMap' in scope
20:05:02       sourceSwiftDepsMap.matches(other.sourceSwiftDepsMap),
20:05:02       ^~~~~~~~~~~~~~~~~~

yim-lee · 2021-02-03T04:47:34Z

@swift-ci please smoke test

yim-lee · 2021-02-03T06:59:58Z

We've moved past the cmake build issues. The "Swift Test macOS Platform (smoke test)" failure is:

22:32:38 error: the library 'SKSwiftPMWorkspace' requires macos 10.10, but depends on the product 'SwiftPM-auto' which requires macos 10.15; consider changing the library 'SKSwiftPMWorkspace' to require macos 10.15 or later, or the product 'SwiftPM-auto' to require macos 10.10 or earlier.

@neonichu ~~I can't find where that is specified actually.~~ Or I guess 10.10 is the default?

Motivation: The same requirement is being added to SwiftPM as part of swiftlang/swift-package-manager#3202. Without this change SourceKit-LSP will fail to build with error: ``` the library 'SKSwiftPMWorkspace' requires macos 10.10, but depends on the product 'SwiftPM-auto' which requires macos 10.15; consider changing the library 'SKSwiftPMWorkspace' to require macos 10.15 or later, or the product 'SwiftPM-auto' to require macos 10.10 or earlier. ``` Modification: Require macOS 10.15. Result: SourceKit-LSP builds successfully with changeset swiftlang/swift-package-manager#3202.

yim-lee · 2021-02-04T18:13:12Z

@swift-ci please smoke test

yim-lee · 2021-02-04T22:41:53Z

@swift-ci please smoke test

yim-lee · 2021-02-04T22:42:40Z

@swift-ci please smoke test

Motivation: Package collections feature will require swift-crypto dependency. Modifications: - Add swift-crypto dependency - Bump minimum macOS version to 10.15, for it's required by swift-crypto

Requires apple/swift-crypto#65

yim-lee · 2021-02-04T22:53:02Z

@swift-ci please smoke test

yim-lee · 2021-02-05T02:15:59Z

🥳 all green!

abertelrud

LGTM

yim-lee · 2021-02-05T09:10:48Z

Testing apple/swift-crypto#67

@swift-ci please smoke test

yim-lee · 2021-02-05T17:04:25Z

@swift-ci please smoke test

tomerd · 2021-02-05T19:32:03Z

🥳

This reverts commit 60d6da6.

yim-lee requested review from abertelrud, friedbunny, neonichu and tomerd as code owners January 16, 2021 21:53

neonichu self-assigned this Jan 19, 2021

yim-lee mentioned this pull request Jan 20, 2021

[update-checkout] Add swift-crypto to the list of repos swiftlang/swift#35507

Merged

yim-lee mentioned this pull request Jan 20, 2021

Add CMake build files apple/swift-crypto#60

Merged

tomerd added the next waiting for next merge window label Jan 20, 2021

yim-lee force-pushed the add-crypto-dep branch from dfc1a40 to 016cb35 Compare January 28, 2021 07:59

yim-lee force-pushed the add-crypto-dep branch from 001ef8a to b01bfac Compare February 3, 2021 03:13

yim-lee mentioned this pull request Feb 3, 2021

Require macOS 10.15 swiftlang/sourcekit-lsp#369

Merged

yim-lee added 4 commits February 4, 2021 14:51

Add swift-crypto dependency

5d125c2

Motivation: Package collections feature will require swift-crypto dependency. Modifications: - Add swift-crypto dependency - Bump minimum macOS version to 10.15, for it's required by swift-crypto

fix build?

e330a39

More progress

e209764

Fix build

0d7b440

Requires apple/swift-crypto#65

yim-lee force-pushed the add-crypto-dep branch from b01bfac to 0d7b440 Compare February 4, 2021 22:52

tomerd approved these changes Feb 5, 2021

View reviewed changes

abertelrud approved these changes Feb 5, 2021

View reviewed changes

neonichu approved these changes Feb 5, 2021

View reviewed changes

yim-lee merged commit 60d6da6 into swiftlang:main Feb 5, 2021

yim-lee deleted the add-crypto-dep branch February 5, 2021 19:12

This was referenced Feb 5, 2021

[Collections] Signing (part 1): certificate and key types #3238

Closed

[SR-12033] [Sema] Do not allow inferring defaultable closure () -> $T for autoclosure arguments result swiftlang/swift#35503

Merged

yim-lee added a commit that referenced this pull request Feb 8, 2021

Revert "Add swift-crypto dependency (#3202)"

16e92aa

This reverts commit 60d6da6.

yim-lee mentioned this pull request Feb 8, 2021

Revert "Add swift-crypto dependency" #3246

Closed

finagolfin mentioned this pull request Jun 7, 2021

Adopt Swift Collections' OrderedSet and OrderedDictionary #3533

Closed

Add swift-crypto dependency #3202

Add swift-crypto dependency #3202

Uh oh!

Conversation

yim-lee commented Jan 16, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yim-lee commented Jan 16, 2021

Uh oh!

yim-lee commented Jan 17, 2021

Uh oh!

yim-lee commented Jan 17, 2021

Uh oh!

abertelrud commented Jan 19, 2021

Uh oh!

tomerd commented Jan 19, 2021

Uh oh!

finagolfin commented Jan 21, 2021

Uh oh!

compnerd commented Jan 22, 2021

Uh oh!

finagolfin commented Jan 22, 2021

Uh oh!

neonichu commented Jan 22, 2021

Uh oh!

yim-lee commented Feb 3, 2021

Uh oh!

yim-lee commented Feb 3, 2021

Uh oh!

yim-lee commented Feb 3, 2021

Uh oh!

yim-lee commented Feb 3, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yim-lee commented Feb 4, 2021

Uh oh!

yim-lee commented Feb 4, 2021

Uh oh!

yim-lee commented Feb 4, 2021

Uh oh!

yim-lee commented Feb 4, 2021

Uh oh!

yim-lee commented Feb 5, 2021

Uh oh!

abertelrud left a comment

Choose a reason for hiding this comment

Uh oh!

yim-lee commented Feb 5, 2021

Uh oh!

yim-lee commented Feb 5, 2021

Uh oh!

tomerd commented Feb 5, 2021

Uh oh!

Uh oh!

yim-lee commented Jan 16, 2021 •

edited

Loading

yim-lee commented Feb 3, 2021 •

edited

Loading