Skip to content

chore: promote develop → main - #138

Merged
JustShinobi merged 2 commits into
mainfrom
develop
Oct 16, 2026
Merged

JustShinobi merged 2 commits into
mainfrom
develop

Conversation

@JustShinobi

Copy link
Copy Markdown
Collaborator

Release

Promotes develop into main.
Auto-generated by the release-pr workflow and refreshed on every push to develop.

Merge method

Warning

Do not squash. This PR must land as a merge commit so Release Please can see individual feat/fix commits on main (squashed promotes stalled 0.10.0).

How: add the promote label (or run the promote-merge workflow). Do not use the green merge button.

Policy: Tools/Get-PRMergePolicy.ps1 · docs/merge-policy.md

Other

JustShinobi and others added 2 commits August 7, 2026 00:06
chore(release): sync v0.31.0 back to develop
* docs(readme): update download links for v0.31.0

* ci: migrate workflows to tiered arc-k3s runners

* ci: trigger CI on tiered runners

* ci: use gh api for merge policy labels

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions Bot added the merge:merge-commit Create a merge commit (do not squash) label Oct 16, 2026
@github-actions

Copy link
Copy Markdown
Contributor

Merge method

Use: Create a merge commit (merge:merge-commit).

Warning

Using the wrong merge method here can break the release pipeline.

PR develop → main
Required method merge commit (do not squash)

Why

develop → main promotion must preserve individual Conventional Commits for Release Please. Squashing collapses them into a single chore commit (stalled 0.10.0 after promotes #60/#63).

How

Do not use the green merge button. Add the promote label (or run the promote-merge workflow). CI must pass; the workflow merges with gh pr merge --merge.

Policy source: Tools/Get-PRMergePolicy.ps1. Rulesets enforce allowed methods per branch.

@JustShinobi JustShinobi added the promote Merge the develop->main promotion PR as a merge commit label Oct 16, 2026
@JustShinobi
JustShinobi merged commit 6b7c03f into main Oct 16, 2026
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merge:merge-commit Create a merge commit (do not squash) promote Merge the develop->main promotion PR as a merge commit

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant