From 3137e53c81939448a87a39ecc909e27e86a8111c Mon Sep 17 00:00:00 2001 From: bartzbeielstein <32470350+bartzbeielstein@users.noreply.github.com> Date: Sun, 14 Jun 2026 11:40:14 +0200 Subject: [PATCH] ci(release): stop poisoning back-merge commit so develop->main PRs pass required checks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The back-merge job tagged its "sync main into develop" commit with a CI-skip marker. No workflow runs on pushes to develop, so the marker skipped nothing there — but it rode along on the merge commit, and when develop was opened as a PR to main that commit became the PR head. GitHub Actions then skipped the pull_request CI run entirely, so the required "Tests (fast)" and "Lint" checks never reported and the develop->main PR (#106) was stuck BLOCKED with no way to satisfy the protect-main ruleset. Drop the marker from the commit message. ci() type → no semantic release. Co-Authored-By: Claude Opus 4.8 (1M context) --- .github/workflows/release.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 54b9493..3d57c31 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -128,8 +128,16 @@ jobs: git checkout develop # -X theirs: when CHANGELOG.md / pyproject.toml conflict (both were # updated from the same base), keep main's final release version. + # + # Do NOT add a "[skip ci]" marker to this commit message. No workflow + # triggers on pushes to develop, so it would skip nothing here — but + # it stays on the merge commit, and when develop is later opened as a + # PR to main that commit becomes the PR head. The marker then + # suppresses the pull_request CI run, so the required "Tests (fast)" + # and "Lint" checks never report and the develop->main PR is stuck + # BLOCKED forever (this is exactly what happened to PR #106). git merge origin/main -X theirs --no-ff \ - -m "chore: sync main into develop [skip ci]" + -m "chore: sync main into develop" git push origin develop # ── Documentation (reusable workflow, shared with docs.yml) ───────────