Skip to content

ci: adopt shared back-merge workflow - #25

Merged
tkgstrator merged 1 commit into
masterfrom
develop
Aug 2, 2026
Merged

ci: adopt shared back-merge workflow#25
tkgstrator merged 1 commit into
masterfrom
develop

Conversation

@tkgstrator

Copy link
Copy Markdown
Contributor

What

Adds .github/workflows/backmerge.yaml, which fast-forwards develop to
master once a release PR merges. Delegates to the shared reusable
workflow at qtmleap/actions.

Why

develop and master drift apart after every release until someone
back-merges by hand. This closes that gap automatically. workflow_dispatch
is kept for manual recovery — it warns and no-ops when a fast-forward is
not possible, so it is safe to run at any time.

Version

No bump. CI-only change; pyproject.toml stays at 0.3.0.

Test plan

  • Workflow only triggers on pull_request: closed against master
    with merged == true, or manual dispatch

🤖 Generated with Claude Code

@tkgstrator
tkgstrator merged commit a791144 into master Aug 2, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant