Skip to content

Track synchronized tink-rust main branch#12184

Open
Legoben wants to merge 1 commit into
masterfrom
oz/bump-tink-rust-to-v0.3.0-eecf54c
Open

Track synchronized tink-rust main branch#12184
Legoben wants to merge 1 commit into
masterfrom
oz/bump-tink-rust-to-v0.3.0-eecf54c

Conversation

@Legoben
Copy link
Copy Markdown
Contributor

@Legoben Legoben commented Jun 4, 2026

Description

Update tink-core, tink-proto, and tink-hybrid to track the synchronized main branch of warpdotdev/tink-rust.

warpdotdev/tink-rust#7 has merged. It syncs the latest upstream project-oak/tink-rust changes into main while preserving our HPKE proto code-generation patch.

Cargo.lock now records the merged tink-rust main commit: 75e88a992698ddd2ec23f9a4e85b43f9745e5796.

The merged tink-core manifest requires serde_json ^1.0.147, so the lockfile also refreshes serde_json from 1.0.145 to the lowest compatible version, 1.0.147, and adds its zmij 0.1.11 transitive dependency.

Linked Issue

N/A — upstream dependency sync.

  • The linked issue is labeled ready-to-spec or ready-to-implement.
  • Where appropriate, screenshots or a short video of the implementation are included below (especially for user-visible or UI changes).

Testing

  • cargo metadata --manifest-path Cargo.toml --locked --format-version 1
  • git diff --check
  • cargo check --manifest-path Cargo.toml --locked -p warp_managed_secrets — blocked in the sandbox because its rustc 1.85.0 is older than existing workspace dependencies requiring rustc 1.86+.
  • I have manually tested my changes locally with ./script/run

Agent Mode

  • Warp Agent Mode - This PR was created via Warp's AI Agent 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.

@cla-bot cla-bot Bot added the cla-signed label Jun 4, 2026
@Legoben Legoben force-pushed the oz/bump-tink-rust-to-v0.3.0-eecf54c branch from dd0df32 to 7204f11 Compare June 4, 2026 16:01
@Legoben Legoben changed the title Bump tink-rust to warpdotdev/v0.3.0-eecf54c (upstream sync) Track synchronized tink-rust main branch Jun 4, 2026
@Legoben Legoben marked this pull request as ready for review June 4, 2026 19:57
@Legoben Legoben requested review from bnavetta and liliwilson June 4, 2026 19:57
@oz-for-oss
Copy link
Copy Markdown
Contributor

oz-for-oss Bot commented Jun 4, 2026

@Legoben

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 /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

Copy link
Copy Markdown
Contributor

@oz-for-oss oz-for-oss Bot left a comment

Choose a reason for hiding this comment

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

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.lock still pins the main branch dependencies to the placeholder pre-merge commit called out in the PR description, so locked builds would not consume the synchronized tink-rust main 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

Comment thread Cargo.lock Outdated
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"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ [IMPORTANT] 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.

@Legoben Legoben force-pushed the oz/bump-tink-rust-to-v0.3.0-eecf54c branch from 7204f11 to 8b7bed1 Compare June 4, 2026 20:01
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>
@Legoben Legoben force-pushed the oz/bump-tink-rust-to-v0.3.0-eecf54c branch from 8b7bed1 to f9d6f5d Compare June 4, 2026 20:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant