mirror of
https://github.com/libretro/virtualjaguar-libretro.git
synced 2026-11-07 04:36:00 -10:00
Establishes the GitFlow branching model (develop / release/* / hotfix/*) and wires the CI to support it. master remains the default GitHub branch (so clones / "View raw" / etc. still resolve). Workflow trigger updates: - c-cpp.yml, regression-test.yml: push fires on [master, develop], pull_request on [develop, master]. Means CI runs on PRs to either branch and on every push that lands. - pull-request.yml: auto-PR for feature/* branches now targets develop, not master. New workflow: - warn-pr-base.yml: comments on PRs that target master, asking the contributor to retarget to develop. Skipped when the source branch is release/* or hotfix/* (the legitimate master-bound exits). Uses pull_request_target so it has write perms on fork PRs; only reads PR metadata so this is safe. Idempotent via a marker comment. New docs: - .github/PULL_REQUEST_TEMPLATE.md: prompts contributors to verify base is develop, with an explicit hotfix/release escape hatch. - docs/release-process.md: documents the full flow including back-merge after tagging and a hotfix recipe. - CLAUDE.md: short branching paragraph so future Claude sessions default to branching off develop. Co-Authored-By: Claude Opus 4.7 <[email protected]>
773 B
773 B
Summary
Test plan
make -j$(getconf _NPROCESSORS_ONLN)builds clean on hostmake testpasses (or N/A — explain why)bash scripts/c89-lint.shpasses (no mid-block declarations)
Branch base
- Base is
develop(the integration branch) - OR base is
masterand this is ahotfix/*orrelease/*branch