chore: make main the shipping branch - #5
Merged
Merged
Conversation
Retargets the tooling now that main carries the fork instead of mirroring upstream, and tightens FORK.md to match. - release.yml builds on pushes to main, not integration, and gains workflow_dispatch. The publish step now also requires event_name == push: the dispatch ref picker offers tags, and re-creating an existing release fails only after a full client build. - Drop the no-commit-to-branch hook. Upstream guards main because theirs is a trunk nobody commits to; ours is the branch we merge into. The hook is always_run, so it also made `pre-commit run --all-files` fail on main. - Pin pre-commit.ci to a quarterly autoupdate. Upstream runs it too, and two bots bumping the same revs monthly would conflict at every upstream merge. - Add dependabot for github-actions: test.yml is our merge gate but is upstream's file, pinning actions/setup-python@v3 and floating @v7 tags. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01BQnnW5jCKXnefXA89eBDoL
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
1 participant
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.
Retargets the tooling now that
maincarries the fork instead of mirroring upstream (#3), andtightens
FORK.mdto match.release.yml— builds on pushes tomaininstead ofintegration, and gainsworkflow_dispatch(now possible: the file is on the default branch). The publish step alsorequires
event_name == 'push', because the dispatch ref picker offers tags and re-creating anexisting release would fail only after a full client build.
.pre-commit-config.yaml— dropsno-commit-to-branch. Upstream guardsmainbecause theirsis a trunk nobody commits to; ours is the branch we merge into. It is
always_run, so it also madepre-commit run --all-filesfail outright onmain. Addsautoupdate_schedule: quarterly:upstream runs pre-commit.ci too, and two bots bumping the same
rev:pins monthly would make thisfile conflict at every upstream merge.
.github/dependabot.yml— new.test.ymlis our merge gate but is upstream's file, pinningactions/setup-python@v3and floating@v7tags.FORK.md— 175 → 149 lines. Rewrites the branch model, replaces theintegrationrebuildrecipe with Merging upstream (merge commit, never squash — with the reason) and Landing a
change, adds
rerere, scopes the "never delete a release tag" warning to the two orphaned tags,records that e2e is flaky, and removes duplicated build/test instructions and the outdated
docformatter note.
Depends on nothing; #4 (ruff formatting) is independent and touches disjoint files.