Skip to content

Pin the fork's integration branch (ADR-0001) - #66

Merged
eduralph merged 4 commits into
mainfrom
pin-integration
Oct 18, 2026
Merged

eduralph merged 4 commits into
mainfrom
pin-integration

Conversation

@eduralph

@eduralph eduralph commented Oct 18, 2026 •

Copy link
Copy Markdown
Contributor

Moves the client-rust subject from upstream tikv/client-rust master to the fork's integration branch, so the loop can build on its own fixes before upstream merges them. Decision record: ADR-0001 (status Proposed).

Pin

CI

  • The check and gate jobs check out the fork with full history; the check job also fetches upstream master for check-pins.sh (the gate job re-running it is CI: the gate job does not re-run the pin's ancestry checks before producing ledger evidence #67).
  • New upstream-view job: runs the parity diff at upstream_base with PARITY_STRICT=0, continue-on-error, and uploads it. It never gates and is not ledger evidence (ledger-check refuses a non-strict run).
  • rust-driver feature pre-557 swaps the ExtractedErrors / MultipleRegionErrors match arms so the driver compiles against both trees; only the upstream view enables it. wyrd-gate drops the ExtractedErrors arm.

Verdict at b10bc69 (evidence, strict, v8.5.5 lease): gate 18 + 1 passed, as expected; ledger G-0001 HOLDS, G-0002 XDIVERGE as declared; upstream view at 3408d95 matches. README verdict restated; the 3408d95 verdict moves to History.

Reviewed before push: batched Codex review (clean) and an adversarial review (its two P1s fixed: the first-parent check and the evidence file; its P2 on the ADR overstating branch protection fixed in the text).

Open question for the maintainer: integration's protection disables force-pushes but does not bind admins and requires no status check; the ADR now says so.

The subject becomes a commit of getwyrd/client-rust integration:
upstream 3408d95 plus #557, #551 and #558. pins.toml gains branch and
upstream_base; check-pins.sh checks rev is on integration and
upstream_base is on both rev and upstream master. CI clones the fork
and adds an informational parity run at upstream_base.

rust-driver handles #557's MultipleRegionErrors, with a pre-557
feature for the upstream run; wyrd-gate drops ExtractedErrors.

Signed-off-by: Eduard Ralph <eduard@ralphovi.net>
Strict make verdict, make ledger and the upstream view at 3408d95, captured on a
leased v8.5.5 cluster at harness 848d24d.

Signed-off-by: Eduard Ralph <eduard@ralphovi.net>
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 18, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-18T00:56:18.483395Z c9a72dd Manual request
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: f738fd4b9a

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread scripts/check-pins.sh Resolved
Comment thread .github/workflows/ci.yml Resolved
Plain merge-base can return a carried PR's tip once upstream merges that PR with
a merge commit: a side-branch state master never was. Take the newest commit on
upstream master's first-parent chain that rev contains instead.

Signed-off-by: Eduard Ralph <eduard@ralphovi.net>
Signed-off-by: Eduard Ralph <eduard@ralphovi.net>
@eduralph

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Another round soon, please!

Reviewed commit: c9a72ddae2

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@eduralph
eduralph merged commit 7fe1535 into main Oct 18, 2026
7 of 8 checks passed
@eduralph
eduralph deleted the pin-integration branch October 20, 2026 11:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant