chore(release): back-merge main into pre-main to unblock #899 - #935
Merged
Conversation
Staging builds always compile pre-main's tree but execute main's copy of this workflow (dispatch is pinned to branch=main for cache-scoping reasons). pre-main already reads MERIDIAN_OTP_API_URL/CLIENT_TOKEN via option_env!, so without this a staging OTP send/verify silently resolves to "not_configured". Unused by main's own code today since Clerk is still the live auth path there.
ci(release): wire OTP worker secrets into release-build.yml
…k key #899 (`pre-main` -> `main`) went CONFLICTING. One file, two hunks, and the same line in both: `.github/workflows/release-build.yml`. `ac43f394` (#931) went straight onto `main` so staging builds - which compile `pre-main`'s tree but execute `main`'s copy of this workflow - could reach the OTP worker. `main` still runs Clerk, so that commit left `MERIDIAN_CLERK_PUBLISHABLE_KEY` in place beside the new OTP vars. `pre-main` had already deleted it in `c9f15596`, which replaced Clerk with the one-time email+OTP capture. Resolved in `pre-main`'s favour: nothing in `pre-main` reads that secret, and once this release lands there is no Clerk build left to read it. Both sides already carried `MERIDIAN_OTP_API_URL` / `MERIDIAN_OTP_CLIENT_TOKEN`, so those merged cleanly and are untouched. The merged tree is byte-identical to `pre-main` - `git diff origin/pre-main` is empty - because that one line was `main`'s only divergence. This is a history merge, not a content change, so #899 can fast-forward past the conflict without anything else moving. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: ASSERTIVE Plan: Team Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#899 (
pre-main→main, v1.91.0) isCONFLICTING. This clears it.The conflict
One file, two hunks, the same line in both:
ac43f394(#931) went straight ontomainso staging builds — which compilepre-main's tree but executemain's copy ofrelease-build.yml— could reach the OTP worker.mainstill runs Clerk, so that commit left the Clerk key in place beside the new OTP vars.pre-mainhad already deleted it inc9f15596, which replaced Clerk with the one-time email+OTP capture.Resolution
Taken in
pre-main's favour. Nothing inpre-mainreads that secret — Clerk survives only in explanatory comments and in two tests that assert it is gone (require-email-capture.test.ts,otp-errors.test.ts) — and once this release lands there is no Clerk build left to read it either.Both sides already carried
MERIDIAN_OTP_API_URLandMERIDIAN_OTP_CLIENT_TOKEN, so those merged cleanly and are untouched in both the macOS and Windows job blocks.Why this is safe
git diff origin/pre-mainis empty. That one line wasmain's only divergence, so the merged tree is byte-identical topre-mainas it stands. This is a history merge, not a content change — #899 gets past the conflict without anything else in the tree moving.Pre-push suite green (fmt, clippy,
cargo test --workspace, UI build, UI tests).🤖 Generated with Claude Code