From 14211cb6059d615b10944c3b071e1fd588afc6f0 Mon Sep 17 00:00:00 2001 From: mathuraditya724 Date: Fri, 16 Oct 2026 13:20:15 -0700 Subject: [PATCH 1/2] ci(release): Skip release bot merge commits Handle Craft merges by revision as well as release branch name while preserving manual releases. Co-Authored-By: Codex --- .github/workflows/release.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a5f474d..00af6e7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,9 +33,14 @@ jobs: release: runs-on: ubuntu-latest name: Release a new version + # Craft merges release branches by SHA, producing "Merge commit '...'". if: >- github.event_name == 'workflow_dispatch' || - !startsWith(github.event.head_commit.message, 'Merge branch ''release/') + ( + !startsWith(github.event.head_commit.message, 'Merge branch ''release/') && + !(github.actor == 'sentry-release-bot[bot]' && + startsWith(github.event.head_commit.message, 'Merge commit ')) + ) steps: - name: Get auth token id: token From d8f778f5fd7491bbf7a16e7d09a25ae65d00bbe4 Mon Sep 17 00:00:00 2001 From: mathuraditya724 Date: Fri, 16 Oct 2026 13:26:18 -0700 Subject: [PATCH 2/2] ci(release): Scope concurrency to eligible release jobs Prevent skipped release merges from cancelling active release preparation. Co-Authored-By: Codex --- .github/workflows/release.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 00af6e7..6624557 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,11 +24,6 @@ permissions: contents: write pull-requests: write -# A newer commit always supersedes a release that has not finished. -concurrency: - group: release - cancel-in-progress: true - jobs: release: runs-on: ubuntu-latest @@ -41,6 +36,10 @@ jobs: !(github.actor == 'sentry-release-bot[bot]' && startsWith(github.event.head_commit.message, 'Merge commit ')) ) + # Apply concurrency after the guard so skipped merges cannot cancel a release. + concurrency: + group: release + cancel-in-progress: true steps: - name: Get auth token id: token