Track synchronized tink-rust main branch#12184
Conversation
dd0df32 to
7204f11
Compare
|
I'm starting a first review of this pull request. You can view the conversation on Warp. I completed the review and no human review was requested for this pull request. Comment Powered by Oz |
There was a problem hiding this comment.
Overview
This PR retargets the tink-core, tink-proto, and tink-hybrid git dependencies from warpdotdev/main to main and updates the corresponding lockfile sources.
Concerns
Cargo.lockstill pins themainbranch dependencies to the placeholder pre-merge commit called out in the PR description, so locked builds would not consume the synchronizedtink-rustmain branch after merge.
Verdict
Found: 0 critical, 1 important, 0 suggestions
Request changes
Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).
Powered by Oz
| name = "tink-core" | ||
| version = "0.3.0" | ||
| source = "git+https://github.com/warpdotdev/tink-rust?branch=warpdotdev%2Fmain#0141035f04a5e262b955c450857b689cff877469" | ||
| source = "git+https://github.com/warpdotdev/tink-rust?branch=main#79126fc45f7a6b76647de99488b745b0cfd08801" |
There was a problem hiding this comment.
Cargo.lock still pins tink-core to the placeholder pre-merge SHA, so --locked builds will not use the synchronized main commit this PR is meant to track. Refresh the lockfile after the upstream tink-rust merge before merging this PR.
7204f11 to
8b7bed1
Compare
Update tink-core, tink-proto, and tink-hybrid to reference the fork's main branch after warpdotdev/tink-rust#7 merged the latest upstream changes and our HPKE proto types patch. Refresh serde_json to the lowest compatible version required by the updated tink-core manifest. Co-Authored-By: Oz <oz-agent@warp.dev>
8b7bed1 to
f9d6f5d
Compare
Description
Update
tink-core,tink-proto, andtink-hybridto track the synchronizedmainbranch of warpdotdev/tink-rust.warpdotdev/tink-rust#7 has merged. It syncs the latest upstream
project-oak/tink-rustchanges intomainwhile preserving our HPKE proto code-generation patch.Cargo.locknow records the merged tink-rustmaincommit:75e88a992698ddd2ec23f9a4e85b43f9745e5796.The merged
tink-coremanifest requiresserde_json ^1.0.147, so the lockfile also refreshesserde_jsonfrom1.0.145to the lowest compatible version,1.0.147, and adds itszmij 0.1.11transitive dependency.Linked Issue
N/A — upstream dependency sync.
ready-to-specorready-to-implement.Testing
cargo metadata --manifest-path Cargo.toml --locked --format-version 1git diff --checkcargo check --manifest-path Cargo.toml --locked -p warp_managed_secrets— blocked in the sandbox because itsrustc 1.85.0is older than existing workspace dependencies requiringrustc 1.86+../script/runAgent Mode
CHANGELOG-NONE
Co-Authored-By: Oz oz-agent@warp.dev
Conversation: https://staging.warp.dev/conversation/59e1d76c-330c-459a-a41d-ff7470665b3d
Run: https://oz.staging.warp.dev/runs/019e9123-37ea-7163-9346-4c4eb2083801
This PR was generated with Oz.