Repo: reserve main for releases, develop for integration #3

Merged
EduarD3V merged 2 commits from chore/branch-model into develop 2026-10-03 10:28:23 +02:00
Owner

Adopts the branch model: main is release/upstream only, develop is the integration branch, issue/* branches PR into develop.

  • CI: push and pull_request triggers gain develop; build scoped to main pushes and tags.
  • AGENTS.md gains a Branches section; the issue-flow skill's git law now allows --force-with-lease on your own issue branch after rebasing onto develop.
  • RELEASING_INSTRUCTIONS.md: releases are cut from main after develop lands there.
  • UC-OP-19 updated (triggers, build flow, notes).
  • Tracks .claude/skills/gotoi-issue-flow (was only in ~/.claude/skills).
Adopts the branch model: main is release/upstream only, develop is the integration branch, issue/* branches PR into develop. - CI: push and pull_request triggers gain develop; build scoped to main pushes and tags. - AGENTS.md gains a Branches section; the issue-flow skill's git law now allows --force-with-lease on your own issue branch after rebasing onto develop. - RELEASING_INSTRUCTIONS.md: releases are cut from main after develop lands there. - UC-OP-19 updated (triggers, build flow, notes). - Tracks .claude/skills/gotoi-issue-flow (was only in ~/.claude/skills).
AGENTS.md and the other three repo skills are tracked; this one existed only in ~/.claude/skills, so a fresh clone had no issue workflow and no forgejo.py.
chore: reserve main for releases, develop for integration
Some checks failed
CI and agent release / test-agent (push) Has been cancelled
CI and agent release / check-docs (push) Has been cancelled
CI and agent release / test-middleware (push) Has been cancelled
CI and agent release / test-dashboard (push) Has been cancelled
CI and agent release / build (push) Has been cancelled
CI and agent release / release (push) Has been cancelled
CI and agent release / publish-images (push) Has been cancelled
CI and agent release / test-dashboard (pull_request) Successful in 3m7s
CI and agent release / test-middleware (pull_request) Failing after 19m1s
CI and agent release / test-agent (pull_request) Successful in 1m27s
CI and agent release / check-docs (pull_request) Successful in 21s
CI and agent release / build (pull_request) Has been cancelled
CI and agent release / release (pull_request) Has been cancelled
CI and agent release / publish-images (pull_request) Has been cancelled
578f94e084
main carries nothing but release cuts; develop is the integration branch every
issue/* branch targets. CI gains develop pushes and pull requests into develop,
and build is scoped to main pushes and tags so develop pushes do not
cross-compile. Documents the model in AGENTS.md, the issue-flow skill, and
RELEASING_INSTRUCTIONS.md; UC-OP-19 triggers and flow updated to match.
EduarD3V merged commit 578f94e084 into develop 2026-10-03 10:28:23 +02:00
Sign in to join this conversation.
No description provided.