Skip to content

Integrate swift-certificates library #6216

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Mar 4, 2023
Merged

Integrate swift-certificates library #6216

merged 4 commits into from
Mar 4, 2023

Conversation

neonichu
Copy link
Contributor

@neonichu neonichu commented Mar 2, 2023

No description provided.

@neonichu neonichu self-assigned this Mar 2, 2023
@neonichu
Copy link
Contributor Author

neonichu commented Mar 3, 2023

swiftlang/swift#64045
apple/swift-certificates#32
@swift-ci please smoke test

tomerd
tomerd reviewed Mar 3, 2023
View reviewed changes
tomerd
tomerd reviewed Mar 3, 2023
View reviewed changes
yim-lee
yim-lee reviewed Mar 3, 2023
View reviewed changes
@neonichu
Copy link
Contributor Author

neonichu commented Mar 3, 2023

apple/swift-crypto#149
swiftlang/swift#64045
apple/swift-certificates#32
@swift-ci please smoke test

@neonichu
Copy link
Contributor Author

neonichu commented Mar 3, 2023

apple/swift-crypto#149
swiftlang/swift#64045
apple/swift-certificates#32
@swift-ci please smoke test linux

@neonichu
Copy link
Contributor Author

neonichu commented Mar 3, 2023 

--- bootstrap: note: Building swift-asn1
CMake Error: The source directory "/Users/ec2-user/jenkins/workspace/swift-package-manager-PR-macos-smoke-test/branch-main/swift-asn1" does not exist.

Not sure what's happening here, maybe the update-checkout changes aren't applied during this type of test?

@neonichu
Copy link
Contributor Author

neonichu commented Mar 3, 2023

Windows failure is

C:\Users\swift-ci\jenkins\workspace\swiftpm-PR-windows\swift-corelibs-foundation\Sources\Foundation\DispatchData+DataProtocol.swift:14:8: error: compiled module was created by an older version of the compiler; rebuild 'Dispatch' and try again: T:\3\src\swift\swift\Dispatch.swiftmodule

@tomerd
Copy link
Contributor

tomerd commented Mar 3, 2023

@shahmishal @compnerd I think this specific windows failure is infra level and you can clear it out?

@compnerd compnerd mentioned this pull request Mar 3, 2023
Closed
@neonichu neonichu mentioned this pull request Mar 3, 2023
Merged
@shahmishal
Copy link
Member

@swift-ci smoke test

@shahmishal
Copy link
Member

apple/swift-crypto#149
swiftlang/swift#64045
apple/swift-certificates#32
@swift-ci please smoke test

@tomerd
Copy link
Contributor

tomerd commented Mar 3, 2023 

CMake Error: The source directory "/Users/ec2-user/jenkins/workspace/swift-package-manager-PR-macos-smoke-test/branch-main/swift-asn1" does not exist.

@shahmishal - checkout of new libraries did not take place?

@neonichu
Copy link
Contributor Author

neonichu commented Mar 3, 2023 •
edited
Loading

We just needed to reverse the way we're running the cross-repo test since update-checkout is what provides the infra for cross-repo tests, it is not itself coming from any mentioned repo unless you test on the Swift repo itself.

These changes passed over on swiftlang/swift#64045 and I inspected the log to see that swift-certificates was being built successfully, so I think this is good to merge for the most part. I was surprised that the Windows build passes, but I think that is just because I added swift-certificates to the CMake setup, but we are not using it yet, partly because PackageSigning wasn't covered by CMake on main at the time I made the PR, so it not being built doesn't cause a failure.

So the remaining issues are:

  • Address update-checkout feedback (that's on me)
  • Address macOS smoke-test issues (that's on the infrastructure / @shahmishal)
  • Optional for this PR (could be follow-on): actually use swift-certificates in the code (that's also on me)

neonichu and others added 3 commits March 3, 2023 09:50
@neonichu
Integrate swift-certificates library
b05b9a8 
This integrates the swift-certificates library into the build.
@neonichu @yim-lee
Add swift-crypto back to bootstrap
84cfd91 
Co-authored-by: Yim Lee <[email protected]>
@neonichu
Fix CMake build
a0497d3
@neonichu neonichu force-pushed the integrate-certificates-library branch from ee30f36 to a0497d3 Compare March 3, 2023 17:56
@neonichu neonichu changed the title WIP: Integrate swift-certificates library Integrate swift-certificates library Mar 3, 2023
@neonichu neonichu marked this pull request as ready for review March 3, 2023 17:56
@neonichu neonichu requested a review from abertelrud as a code owner March 3, 2023 17:56
yim-lee added a commit to yim-lee/swift-package-manager that referenced this pull request Mar 3, 2023
@yim-lee
Add swift-certificates. Cleanup swift-crypto. Swift 5.7 and macOS 12.
45c6dc1 
Basically:
swiftlang#6216
swiftlang#6138
swiftlang#6214
@neonichu neonichu mentioned this pull request Mar 3, 2023
Merged
yim-lee added a commit to yim-lee/swift-package-manager that referenced this pull request Mar 4, 2023
@yim-lee
Add swift-certificates. Cleanup swift-crypto. Swift 5.7 and macOS 12.
8af0572 
Basically:
swiftlang#6216
swiftlang#6138
swiftlang#6214
@shahmishal shahmishal merged commit 36d0a8a into main Mar 4, 2023
@compnerd compnerd deleted the integrate-certificates-library branch March 26, 2023 03:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tomerd tomerd tomerd approved these changes

@yim-lee yim-lee yim-lee approved these changes

@abertelrud abertelrud Awaiting requested review from abertelrud

Assignees

@neonichu neonichu

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@neonichu @tomerd @shahmishal @yim-lee