Skip to content

Switch to swift-crypto v2.x #5920

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 3 commits into from
Jan 10, 2023
Merged

Switch to swift-crypto v2.x #5920

merged 3 commits into from
Jan 10, 2023

Conversation

@yim-lee
Copy link
Contributor

@yim-lee yim-lee commented Nov 22, 2022 •
edited
Loading

rdar://82934196

Update to swift-crypto 2.2.1 2.2.2 2.2.3

@yim-lee
Copy link
Contributor Author

yim-lee commented Nov 22, 2022 •
edited
Loading

TODO: I will work on the update-checkout changes next week.

swiftlang/swift#62289
swiftlang/swift-source-compat-suite#744

@yim-lee yim-lee mentioned this pull request Nov 29, 2022
Closed
yim-lee added a commit to yim-lee/swift that referenced this pull request Nov 29, 2022
@yim-lee
Bump swift-crypto to 2.2.1
b866e88 
This is for swiftlang/swift-package-manager#5920

rdar://82934196
@yim-lee yim-lee mentioned this pull request Nov 29, 2022
Closed
@yim-lee
Copy link
Contributor Author

yim-lee commented Nov 29, 2022

swiftlang/swift#62289

@swift-ci smoke test

@yim-lee
Copy link
Contributor Author

yim-lee commented Nov 29, 2022

Opened apple/swift-crypto#136 in attempt to address Windows build failure.

@neonichu
Copy link
Contributor

neonichu commented Nov 29, 2022

side-note: #5917 will help with this type of failure as well since the CMake build won't build the (unused on Windows) collections stuff anymore

@yim-lee
Copy link
Contributor Author

yim-lee commented Nov 30, 2022

@neonichu Yeah, I suppose another option is for this to wait for merging of #5917 if that happens sooner.

@yim-lee yim-lee requested a review from compnerd November 30, 2022 17:00
@yim-lee
Copy link
Contributor Author

yim-lee commented Nov 30, 2022

Testing apple/swift-crypto#136

swiftlang/swift#62320
@swift-ci smoke test

@yim-lee
Copy link
Contributor Author

yim-lee commented Nov 30, 2022

https://ci-external.swift.org/job/swiftpm-PR-windows/596/

Error on repo "C:\Users\swift-ci\jenkins\workspace\swiftpm-PR-windows\swift-crypto": Traceback (most recent call last):
  File "C:\Users\swift-ci\jenkins\workspace\swiftpm-PR-windows\swift\utils\update_checkout\update_checkout\update_checkout.py", line 167, in update_single_repository
    config, repo_name, scheme_name, scheme_map, cross_repos_pr)
  File "C:\Users\swift-ci\jenkins\workspace\swiftpm-PR-windows\swift\utils\update_checkout\update_checkout\update_checkout.py", line 140, in get_branch_for_repo
    echo=True)
  File "C:\Users\swift-ci\jenkins\workspace\swiftpm-PR-windows\swift\utils\swift_build_support\swift_build_support\shell.py", line 255, in run
    raise eout
Exception: ['git', 'checkout', 'yim-lee-patch-1']

Pretty sure the branch yim-lee-patch-1 exists in swift-crypto (apple/swift-crypto#136). Am I missing something obvious? 👀 @shahmishal @neonichu

@yim-lee
Copy link
Contributor Author

yim-lee commented Nov 30, 2022

swiftlang/swift#62320
@swift-ci smoke test

@yim-lee
Copy link
Contributor Author

yim-lee commented Dec 1, 2022 •
edited
Loading

With #5917 merged, we shouldn't need the cmake change. Trying again with original update-checkout PR.

swiftlang/swift#62289

@swift-ci smoke test

@yim-lee
Copy link
Contributor Author

yim-lee commented Dec 1, 2022

swiftlang/swift#62289
@swift-ci smoke test

@yim-lee
Copy link
Contributor Author

yim-lee commented Dec 1, 2022

swiftlang/swift#62289

@swift-ci smoke test

@yim-lee
Copy link
Contributor Author

yim-lee commented Dec 1, 2022

swiftlang/swift#62320

@swift-ci smoke test

1 similar comment
@yim-lee
Copy link
Contributor Author

yim-lee commented Dec 1, 2022

swiftlang/swift#62320

@swift-ci smoke test

@yim-lee
Copy link
Contributor Author

yim-lee commented Dec 1, 2022

swiftlang/swift#62289

@swift-ci smoke test

3 similar comments
@yim-lee
Copy link
Contributor Author

yim-lee commented Dec 1, 2022

swiftlang/swift#62289

@swift-ci smoke test

@yim-lee
Copy link
Contributor Author

yim-lee commented Dec 1, 2022

swiftlang/swift#62289

@swift-ci smoke test

@yim-lee
Copy link
Contributor Author

yim-lee commented Dec 2, 2022

swiftlang/swift#62289

@swift-ci smoke test

@yim-lee
Copy link
Contributor Author

yim-lee commented Dec 2, 2022

swiftlang/swift#62320

@swift-ci smoke test

@yim-lee
Copy link
Contributor Author

yim-lee commented Dec 8, 2022

swiftlang/swift#62289
@swift-ci smoke test

1 similar comment
@yim-lee
Copy link
Contributor Author

yim-lee commented Dec 8, 2022

swiftlang/swift#62289
@swift-ci smoke test

@yim-lee
Copy link
Contributor Author

yim-lee commented Dec 8, 2022

swiftlang/swift#62289
@swift-ci smoke test windows

2 similar comments
@yim-lee
Copy link
Contributor Author

yim-lee commented Dec 9, 2022

swiftlang/swift#62289
@swift-ci smoke test windows

@yim-lee
Copy link
Contributor Author

yim-lee commented Dec 9, 2022

swiftlang/swift#62289
@swift-ci smoke test windows

@yim-lee
Copy link
Contributor Author

yim-lee commented Dec 9, 2022

@compnerd @buttaface Do you have any concerns / comments on this PR?

@finagolfin
Copy link
Member

finagolfin commented Dec 9, 2022

None on my end, just happy to see this moving forward.

@yim-lee yim-lee mentioned this pull request Dec 25, 2022
Merged
compnerd
compnerd approved these changes Dec 25, 2022
View reviewed changes
Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is great! It should help get builds of SPM on Windows ARM64!

@yim-lee
Copy link
Contributor Author

yim-lee commented Dec 25, 2022

Will need a swift-crypto release that includes apple/swift-crypto#137

@yim-lee
Copy link
Contributor Author

yim-lee commented Jan 6, 2023

swiftlang/swift#62289
@swift-ci please smoke test

@yim-lee
Copy link
Contributor Author

yim-lee commented Jan 6, 2023

swiftlang/swift#62289
@swift-ci please smoke test windows

@yim-lee yim-lee mentioned this pull request Jan 6, 2023
Merged
@yim-lee
Copy link
Contributor Author

yim-lee commented Jan 6, 2023

swiftlang/swift#62890
@swift-ci please smoke test

1 similar comment
@yim-lee
Copy link
Contributor Author

yim-lee commented Jan 6, 2023

swiftlang/swift#62890
@swift-ci please smoke test

@yim-lee
Copy link
Contributor Author

yim-lee commented Jan 6, 2023

swiftlang/swift#62890
@swift-ci please smoke test linux

@yim-lee yim-lee mentioned this pull request Jan 6, 2023
Merged
yim-lee added a commit to yim-lee/swift-package-manager that referenced this pull request Jan 6, 2023
@yim-lee
Swift to swift-crypto v2.x
dfb4972 
Cherry-pick swiftlang#5920 to 5.8

rdar://82934196
@yim-lee yim-lee mentioned this pull request Jan 6, 2023
Merged
@yim-lee
Copy link
Contributor Author

yim-lee commented Jan 6, 2023

swiftlang/swift#62890
@swift-ci please smoke test

@yim-lee
Copy link
Contributor Author

yim-lee commented Jan 6, 2023

swiftlang/swift#62890
@swift-ci please smoke test windows

1 similar comment
@yim-lee
Copy link
Contributor Author

yim-lee commented Jan 7, 2023

swiftlang/swift#62890
@swift-ci please smoke test windows

@shahmishal shahmishal merged commit 0c267bf into swiftlang:main Jan 10, 2023
shahmishal pushed a commit that referenced this pull request Jan 10, 2023
@yim-lee
Swift to swift-crypto v2.x (#6029)
f61b84f 
Cherry-pick #5920 to 5.8

rdar://82934196
@yim-lee yim-lee deleted the swift-crypto-2.x branch January 10, 2023 16:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@compnerd compnerd compnerd approved these changes

@neonichu neonichu neonichu approved these changes

@abertelrud abertelrud Awaiting requested review from abertelrud

@elsh elsh Awaiting requested review from elsh

+1 more reviewer

@tomerd tomerd tomerd approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@yim-lee yim-lee

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@yim-lee @neonichu @MaxDesiatov @finagolfin @compnerd @tomerd @shahmishal