Skip to content

Record the main merge gate in infra notes #19

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

Merged
nimkimi merged 1 commit into from
Aug 20, 2026
Merged

Record the main merge gate in infra notes #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions docs/infra.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@
- That direction is a per-project domain setting, and `vercel domains` has no subcommand for it — it is API-only: `PATCH /v9/projects/{projectId}/domains/{domain}?teamId=…` with `{"redirect", "redirectStatusCode"}`. Clear the old redirect before adding the new one; setting the new one first leaves the two hosts pointing at each other. DNS is not involved — apex `A 76.76.21.21` and `www CNAME → apex` already serve both, and the nameservers are Hostinger's.
- `hackimi.vercel.app` additionally 308s to apex via `next.config.js` (exact-host rule — preview URLs on \*.vercel.app are deliberately not matched).

## Merge gate (GitHub → Settings → Branches)

- `main` requires the `Lint, types, tests, E2E` check to pass before a PR can merge (added 2026-08-20). That one context only: the Vercel and GitGuardian checks are third-party, so requiring them puts their outages in the merge path, and `Deploy to Vercel (production)` is skipped on PRs — requiring a check that never runs is a trap.
- Repo-level "Allow auto-merge" is on. **Both settings are needed for `gh pr merge --auto` to mean anything.** With auto-merge disabled, or with no required check to wait for, `--auto` does not warn — it silently degrades to an immediate merge. That is how PR #18 merged while CI was still pending.
- Deliberately not set: strict mode (a PR need not be rebased on latest `main`, which would otherwise stall auto-merge every time `main` moves), required reviews (solo repo — GitHub forbids self-approval, so requiring one would block every merge), and admin enforcement (leaves an escape hatch for a genuine emergency).
- Note the split this creates: merges are now gated, and deploys always were. A red PR cannot reach `main`, and a red `main` cannot reach production.

## Deployments

- Production deploys are automatic but CI-gated (commit `1c92564`, 2026-06-02): GitHub Actions runs lint/types/Vitest/Playwright on every push, and a deploy job (`vercel build` + `vercel deploy --prebuilt --prod`) runs only on `main` after the tests pass.
Expand Down
Loading