From 38202c8dc02ba0601f94f35f7b8d043049db69d6 Mon Sep 17 00:00:00 2001
From: Maarten Zuidhoorn <maarten@zuidhoorn.com>
Date: Tue, 11 Nov 2025 12:11:58 +0100
Subject: [PATCH 1/9] Check if any PRs in the merge queue affect a release

---
 .github/workflows/check-release.yml | 55 +++++++++++++++++++++++++++++
 .github/workflows/main.yml          | 11 ++++--
 2 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/check-release.yml

diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml
new file mode 100644
index 00000000000..4f2da2bd447
--- /dev/null
+++ b/.github/workflows/check-release.yml
@@ -0,0 +1,55 @@
+name: Check release
+
+on:
+  workflow_call:
+
+jobs:
+  check-release:
+    name: Check merge queue conflicts
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Check commits for changes in released packages
+        shell: bash
+        run: |
+          git fetch origin main:origin/main
+
+          PACKAGES=$(echo packages/*/package.json)
+          RELEASED_PACKAGES=()
+
+          # Get all packages being released in this PR
+          for package in $PACKAGES; do
+            MAIN_VERSION=$(git show origin/main:$package | jq -r .version)
+            HEAD_VERSION=$(jq -r .version $package)
+
+            if [ "$HEAD_VERSION" != "$MAIN_VERSION" ]; then
+              echo "📦 Package $package is being released (version $MAIN_VERSION -> $HEAD_VERSION)"
+              RELEASED_PACKAGES+=("$package")
+            fi
+          done
+
+          # Get all files changed by other queued PRs (exclude release PR commit)
+          git diff --name-only origin/main..HEAD^ > group-files.txt
+
+          CONFLICTS=()
+          for pkg in "${RELEASED_PACKAGES[@]}"; do
+            pkg_dir=$(dirname $pkg)
+            if grep -q "^$pkg_dir/" group-files.txt; then
+              CONFLICTS+=("$pkg_dir")
+            fi
+          done
+
+          if [ ${#CONFLICTS[@]} -ne 0 ]; then
+            for conflict in "${CONFLICTS[@]}"; do
+              echo "::error:: Release conflict detected in $conflict."
+            done
+            exit 1
+          else
+            echo "✅ No release conflicts detected."
+          fi
+
+
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a54afc89eca..1a77ae58592 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches: [main]
   pull_request:
+  merge_group:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.sha || github.ref }}
@@ -65,7 +66,7 @@ jobs:
   is-release:
     name: Determine whether this is a release merge commit
     needs: lint-build-test
-    if: github.event_name == 'push'
+    if: github.event_name == 'push' || github.event_name == 'merge_group'
     runs-on: ubuntu-latest
     outputs:
       IS_RELEASE: ${{ steps.is-release.outputs.IS_RELEASE }}
@@ -75,10 +76,16 @@ jobs:
         with:
           commit-starts-with: 'Release [version],Release v[version],Release/[version],Release/v[version],Release `[version]`'
 
+  check-release:
+    name: Check release
+    needs: is-release
+    if: needs.is-release.outputs.IS_RELEASE == 'true' && github.event_name == 'merge_group'
+    uses: ./.github/workflows/check-release.yml
+
   publish-release:
     name: Publish release
     needs: is-release
-    if: needs.is-release.outputs.IS_RELEASE == 'true'
+    if: needs.is-release.outputs.IS_RELEASE == 'true' && github.event_name == 'push'
     permissions:
       contents: write
     uses: ./.github/workflows/publish-release.yml

From 7beae1c145f5e68f909a9b354d68332da8596d92 Mon Sep 17 00:00:00 2001
From: Maarten Zuidhoorn <maarten@zuidhoorn.com>
Date: Tue, 11 Nov 2025 13:46:50 +0100
Subject: [PATCH 2/9] Improve safety and check for changes in main too

---
 .github/workflows/check-release.yml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml
index 4f2da2bd447..486b4fc1459 100644
--- a/.github/workflows/check-release.yml
+++ b/.github/workflows/check-release.yml
@@ -16,15 +16,16 @@ jobs:
       - name: Check commits for changes in released packages
         shell: bash
         run: |
+          set -euo pipefail
           git fetch origin main:origin/main
 
-          PACKAGES=$(echo packages/*/package.json)
+          mapfile -t PACKAGES < <(find packages -maxdepth 2 -name "package.json" -not -path "*/node_modules/*")
           RELEASED_PACKAGES=()
 
           # Get all packages being released in this PR
-          for package in $PACKAGES; do
-            MAIN_VERSION=$(git show origin/main:$package | jq -r .version)
-            HEAD_VERSION=$(jq -r .version $package)
+          for package in "${PACKAGES[@]}"; do
+            MAIN_VERSION=$(git show "origin/main:$package" | jq -r .version)
+            HEAD_VERSION=$(jq -r .version "$package")
 
             if [ "$HEAD_VERSION" != "$MAIN_VERSION" ]; then
               echo "📦 Package $package is being released (version $MAIN_VERSION -> $HEAD_VERSION)"
@@ -32,17 +33,18 @@ jobs:
             fi
           done
 
-          # Get all files changed by other queued PRs (exclude release PR commit)
-          git diff --name-only origin/main..HEAD^ > group-files.txt
+          # Get all files changed ahead of this PR.
+          git diff --name-only HEAD^..$(git merge-base HEAD origin/main) > changed-files.txt
 
           CONFLICTS=()
           for pkg in "${RELEASED_PACKAGES[@]}"; do
-            pkg_dir=$(dirname $pkg)
-            if grep -q "^$pkg_dir/" group-files.txt; then
+            pkg_dir=$(dirname "$pkg")
+            if grep -q "^$pkg_dir/" changed-files.txt; then
               CONFLICTS+=("$pkg_dir")
             fi
           done
 
+          CONFLICTS=($(printf "%s\n" "${CONFLICTS[@]}" | sort -u))
           if [ ${#CONFLICTS[@]} -ne 0 ]; then
             for conflict in "${CONFLICTS[@]}"; do
               echo "::error:: Release conflict detected in $conflict."

From 3bd1b22bce4b30fadbbd851accfca1aa20117f1d Mon Sep 17 00:00:00 2001
From: Maarten Zuidhoorn <maarten@zuidhoorn.com>
Date: Tue, 11 Nov 2025 13:51:05 +0100
Subject: [PATCH 3/9] Fix shellcheck errors

---
 .github/workflows/check-release.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml
index 486b4fc1459..779c1ecbd95 100644
--- a/.github/workflows/check-release.yml
+++ b/.github/workflows/check-release.yml
@@ -34,7 +34,7 @@ jobs:
           done
 
           # Get all files changed ahead of this PR.
-          git diff --name-only HEAD^..$(git merge-base HEAD origin/main) > changed-files.txt
+          git diff --name-only "HEAD^..$(git merge-base HEAD origin/main)" > changed-files.txt
 
           CONFLICTS=()
           for pkg in "${RELEASED_PACKAGES[@]}"; do
@@ -44,7 +44,7 @@ jobs:
             fi
           done
 
-          CONFLICTS=($(printf "%s\n" "${CONFLICTS[@]}" | sort -u))
+          mapfile -t CONFLICTS < <(printf "%s\n" "${CONFLICTS[@]}" | sort -u)
           if [ ${#CONFLICTS[@]} -ne 0 ]; then
             for conflict in "${CONFLICTS[@]}"; do
               echo "::error:: Release conflict detected in $conflict."
@@ -53,5 +53,3 @@ jobs:
           else
             echo "✅ No release conflicts detected."
           fi
-
-

From 8ed7a55f131e4b2fe36cb43c0f8a4f87eb3c73cb Mon Sep 17 00:00:00 2001
From: Maarten Zuidhoorn <maarten@zuidhoorn.com>
Date: Wed, 12 Nov 2025 14:46:41 +0100
Subject: [PATCH 4/9] Move script to separate action and run for PRs

---
 .github/actions/check-release/action.yml | 63 ++++++++++++++++++++++++
 .github/workflows/check-release.yml      | 55 ---------------------
 .github/workflows/main.yml               | 30 ++++++++---
 3 files changed, 85 insertions(+), 63 deletions(-)
 create mode 100644 .github/actions/check-release/action.yml
 delete mode 100644 .github/workflows/check-release.yml

diff --git a/.github/actions/check-release/action.yml b/.github/actions/check-release/action.yml
new file mode 100644
index 00000000000..ecdaec13c9d
--- /dev/null
+++ b/.github/actions/check-release/action.yml
@@ -0,0 +1,63 @@
+name: Check release
+description: Check for conflicts in packages being released in this PR.
+
+inputs:
+  before:
+    description: 'The commit SHA before the current commit or pull request.'
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: Check commits for changes in released packages
+      shell: bash
+      env:
+        BEFORE: ${{ inputs.before }}
+      run: |
+        set -euo pipefail
+        git fetch origin main
+
+        mapfile -t PACKAGES < <(find packages -maxdepth 2 -name "package.json" -not -path "*/node_modules/*")
+        RELEASED_PACKAGES=()
+
+        # Get all packages being released in this PR
+        for package in "${PACKAGES[@]}"; do
+          MAIN_VERSION=$(git show "refs/remotes/origin/main:$package" | jq -r .version)
+          HEAD_VERSION=$(jq -r .version "$package")
+
+          if [ "$HEAD_VERSION" != "$MAIN_VERSION" ]; then
+            package_name=$(jq -r ".name" "$package")
+            echo "📦 Package \`$package_name\` is being released (version \`$MAIN_VERSION\` -> \`$HEAD_VERSION\`)"
+            RELEASED_PACKAGES+=("$package")
+          fi
+        done
+
+        # Get all files changed ahead of this PR.
+        git diff --name-only "$BEFORE..$(git merge-base HEAD refs/remotes/origin/main)" > changed-files.txt
+
+        CONFLICTS=()
+        for package in "${RELEASED_PACKAGES[@]}"; do
+          package_directory=$(dirname "$package")
+          if grep -q "^$package_directory/" changed-files.txt; then
+            CONFLICTS+=("$package_directory")
+          fi
+        done
+
+        if [ ${#CONFLICTS[@]} -ne 0 ]; then
+          mapfile -t CONFLICTS < <(printf "%s\n" "${CONFLICTS[@]}" | sort -u)
+        fi
+
+        if [ ${#CONFLICTS[@]} -ne 0 ]; then
+          for conflict in "${CONFLICTS[@]}"; do
+            package_name=$(jq -r ".name" "$conflict/package.json")
+            echo "::error::Release conflict detected in \`$package_name\`. This package is being released in this PR, but files in the package were also modified ahead of this PR. Please ensure that all changes are included in the release."
+          done
+          exit 1
+        else
+          echo "✅ No release conflicts detected."
+        fi
diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml
deleted file mode 100644
index 779c1ecbd95..00000000000
--- a/.github/workflows/check-release.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-name: Check release
-
-on:
-  workflow_call:
-
-jobs:
-  check-release:
-    name: Check merge queue conflicts
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Check commits for changes in released packages
-        shell: bash
-        run: |
-          set -euo pipefail
-          git fetch origin main:origin/main
-
-          mapfile -t PACKAGES < <(find packages -maxdepth 2 -name "package.json" -not -path "*/node_modules/*")
-          RELEASED_PACKAGES=()
-
-          # Get all packages being released in this PR
-          for package in "${PACKAGES[@]}"; do
-            MAIN_VERSION=$(git show "origin/main:$package" | jq -r .version)
-            HEAD_VERSION=$(jq -r .version "$package")
-
-            if [ "$HEAD_VERSION" != "$MAIN_VERSION" ]; then
-              echo "📦 Package $package is being released (version $MAIN_VERSION -> $HEAD_VERSION)"
-              RELEASED_PACKAGES+=("$package")
-            fi
-          done
-
-          # Get all files changed ahead of this PR.
-          git diff --name-only "HEAD^..$(git merge-base HEAD origin/main)" > changed-files.txt
-
-          CONFLICTS=()
-          for pkg in "${RELEASED_PACKAGES[@]}"; do
-            pkg_dir=$(dirname "$pkg")
-            if grep -q "^$pkg_dir/" changed-files.txt; then
-              CONFLICTS+=("$pkg_dir")
-            fi
-          done
-
-          mapfile -t CONFLICTS < <(printf "%s\n" "${CONFLICTS[@]}" | sort -u)
-          if [ ${#CONFLICTS[@]} -ne 0 ]; then
-            for conflict in "${CONFLICTS[@]}"; do
-              echo "::error:: Release conflict detected in $conflict."
-            done
-            exit 1
-          else
-            echo "✅ No release conflicts detected."
-          fi
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1a77ae58592..0733dbd61ed 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -63,10 +63,29 @@ jobs:
     needs: check-workflows
     uses: ./.github/workflows/lint-build-test.yml
 
+  check-release:
+    name: Check release
+    needs: check-workflows
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check if the commit or pull request is a release
+        id: is-release
+        uses: MetaMask/action-is-release@d063725cd15ee145d7e795a2e77db31a3e3f2c92
+        with:
+          commit-starts-with: 'Release [version],Release v[version],Release/[version],Release/v[version],Release `[version]`'
+          commit-message: ${{ github.event.pull_request.title }}
+          before: ${{ github.event.pull_request.base.sha || github.event.merge_group.base_sha || github.event.before }}
+
+      - name: Check for release conflicts
+        if: steps.is-release.outputs.IS_RELEASE == 'true'
+        uses: ./.github/actions/check-release
+        with:
+          before: ${{ github.event.pull_request.base.sha || github.event.merge_group.base_sha || github.event.before }}
+
   is-release:
     name: Determine whether this is a release merge commit
     needs: lint-build-test
-    if: github.event_name == 'push' || github.event_name == 'merge_group'
+    if: github.event_name == 'push'
     runs-on: ubuntu-latest
     outputs:
       IS_RELEASE: ${{ steps.is-release.outputs.IS_RELEASE }}
@@ -76,16 +95,10 @@ jobs:
         with:
           commit-starts-with: 'Release [version],Release v[version],Release/[version],Release/v[version],Release `[version]`'
 
-  check-release:
-    name: Check release
-    needs: is-release
-    if: needs.is-release.outputs.IS_RELEASE == 'true' && github.event_name == 'merge_group'
-    uses: ./.github/workflows/check-release.yml
-
   publish-release:
     name: Publish release
     needs: is-release
-    if: needs.is-release.outputs.IS_RELEASE == 'true' && github.event_name == 'push'
+    if: needs.is-release.outputs.IS_RELEASE == 'true'
     permissions:
       contents: write
     uses: ./.github/workflows/publish-release.yml
@@ -106,6 +119,7 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - analyse-code
+      - check-release
       - lint-build-test
     outputs:
       passed: ${{ steps.set-output.outputs.passed }}

From 44bc407f3561934c2cc345da97982c8bbebabf93 Mon Sep 17 00:00:00 2001
From: Maarten Zuidhoorn <maarten@zuidhoorn.com>
Date: Wed, 12 Nov 2025 16:57:43 +0100
Subject: [PATCH 5/9] Use merge base to check if current commit or PR is a
 release

---
 .github/workflows/main.yml | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0733dbd61ed..bf2dfc51215 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -68,19 +68,33 @@ jobs:
     needs: check-workflows
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Get merge base
+        id: merge-base
+        if: github.event_name != 'push'
+        env:
+          BASE_REF: ${{ github.event.pull_request.base.ref || github.event.merge_group.base_ref }}
+        run: |
+          echo "MERGE_BASE=$(git merge-base HEAD "refs/remotes/origin/$BASE_REF")" >> "$GITHUB_OUTPUT"
+
       - name: Check if the commit or pull request is a release
         id: is-release
+        if: github.event_name != 'push'
         uses: MetaMask/action-is-release@d063725cd15ee145d7e795a2e77db31a3e3f2c92
         with:
           commit-starts-with: 'Release [version],Release v[version],Release/[version],Release/v[version],Release `[version]`'
           commit-message: ${{ github.event.pull_request.title }}
-          before: ${{ github.event.pull_request.base.sha || github.event.merge_group.base_sha || github.event.before }}
+          before: ${{ steps.merge-base.outputs.MERGE_BASE }}
 
-      - name: Check for release conflicts
-        if: steps.is-release.outputs.IS_RELEASE == 'true'
+      - name: Check release
+        if: github.event_name != 'push' && steps.is-release.outputs.IS_RELEASE == 'true'
         uses: ./.github/actions/check-release
         with:
-          before: ${{ github.event.pull_request.base.sha || github.event.merge_group.base_sha || github.event.before }}
+          before: ${{ github.event.pull_request.base.sha || github.event.merge_group.base_sha }}
 
   is-release:
     name: Determine whether this is a release merge commit

From 4ee5c8dcc15ea0bd4de6f2a312b282ede6bc3250 Mon Sep 17 00:00:00 2001
From: Maarten Zuidhoorn <maarten@zuidhoorn.com>
Date: Wed, 12 Nov 2025 17:08:23 +0100
Subject: [PATCH 6/9] Use merge base for checking main version

---
 .github/actions/check-release/action.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/actions/check-release/action.yml b/.github/actions/check-release/action.yml
index ecdaec13c9d..e99769c2328 100644
--- a/.github/actions/check-release/action.yml
+++ b/.github/actions/check-release/action.yml
@@ -26,8 +26,9 @@ runs:
         RELEASED_PACKAGES=()
 
         # Get all packages being released in this PR
+        MERGE_BASE=$(git merge-base HEAD refs/remotes/origin/main)
         for package in "${PACKAGES[@]}"; do
-          MAIN_VERSION=$(git show "refs/remotes/origin/main:$package" | jq -r .version)
+          MAIN_VERSION=$(git show "$MERGE_BASE:$package" | jq -r .version)
           HEAD_VERSION=$(jq -r .version "$package")
 
           if [ "$HEAD_VERSION" != "$MAIN_VERSION" ]; then
@@ -38,7 +39,7 @@ runs:
         done
 
         # Get all files changed ahead of this PR.
-        git diff --name-only "$BEFORE..$(git merge-base HEAD refs/remotes/origin/main)" > changed-files.txt
+        git diff --name-only "$BEFORE..$MERGE_BASE" > changed-files.txt
 
         CONFLICTS=()
         for package in "${RELEASED_PACKAGES[@]}"; do

From 9c6ac2c771c3d87fa22671876a3a87051e28e18e Mon Sep 17 00:00:00 2001
From: Maarten Zuidhoorn <maarten@zuidhoorn.com>
Date: Thu, 13 Nov 2025 14:43:05 +0100
Subject: [PATCH 7/9] Use pull request branch for determining changes, instead
 of base.sha

---
 .github/actions/check-release/action.yml | 14 ++++++++++----
 .github/workflows/main.yml               | 22 +++++++++++++++++++++-
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/.github/actions/check-release/action.yml b/.github/actions/check-release/action.yml
index e99769c2328..d336569b896 100644
--- a/.github/actions/check-release/action.yml
+++ b/.github/actions/check-release/action.yml
@@ -2,8 +2,8 @@ name: Check release
 description: Check for conflicts in packages being released in this PR.
 
 inputs:
-  before:
-    description: 'The commit SHA before the current commit or pull request.'
+  pull-request:
+    description: 'The pull request number to get changed files from.'
     required: true
 
 runs:
@@ -17,7 +17,7 @@ runs:
     - name: Check commits for changes in released packages
       shell: bash
       env:
-        BEFORE: ${{ inputs.before }}
+        PULL_REQUEST: ${{ inputs.pull-request }}
       run: |
         set -euo pipefail
         git fetch origin main
@@ -39,7 +39,13 @@ runs:
         done
 
         # Get all files changed ahead of this PR.
-        git diff --name-only "$BEFORE..$MERGE_BASE" > changed-files.txt
+        PULL_REQUEST_BRANCH=$(gh pr view "$PULL_REQUEST" --json headRefName --template "{{ .headRefName }}")
+
+        echo "🔍 Checking for release conflicts with files changed ahead of PR branch \`$PULL_REQUEST_BRANCH\`..."
+
+        git fetch origin "$PULL_REQUEST_BRANCH"
+        BEFORE=$(git merge-base "refs/remotes/origin/main" "$PULL_REQUEST_BRANCH")
+        git diff --name-only "$BEFORE..refs/remotes/origin/main" > changed-files.txt
 
         CONFLICTS=()
         for package in "${RELEASED_PACKAGES[@]}"; do
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bf2dfc51215..fcdc910e89a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -90,11 +90,31 @@ jobs:
           commit-message: ${{ github.event.pull_request.title }}
           before: ${{ steps.merge-base.outputs.MERGE_BASE }}
 
+      - name: Get pull request number
+        if: github.event_name != 'push'
+        id: pr-number
+        env:
+          EVENT_NAME: ${{ github.event_name }}
+          PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }}
+          MERGE_GROUP_HEAD_REF: ${{ github.event.merge_group.head_ref }}
+        run: |
+          if [ "$EVENT_NAME" = "pull_request" ]; then
+            echo "PR_NUMBER=$PULL_REQUEST_NUMBER" >> "$GITHUB_OUTPUT"
+          elif [ "$EVENT_NAME" = "merge_group" ]; then
+            PR_NUMBER_REGEX='/pr-([0-9]+)-'
+            if [[ "$MERGE_GROUP_HEAD_REF" =~ $PR_NUMBER_REGEX ]]; then
+              echo "PR_NUMBER=${BASH_REMATCH[1]}" >> "$GITHUB_OUTPUT"
+            else
+              echo "::error::Could not extract PR number from merge group head ref: $MERGE_GROUP_HEAD_REF."
+              exit 1
+            fi
+          fi
+
       - name: Check release
         if: github.event_name != 'push' && steps.is-release.outputs.IS_RELEASE == 'true'
         uses: ./.github/actions/check-release
         with:
-          before: ${{ github.event.pull_request.base.sha || github.event.merge_group.base_sha }}
+          pull-request: ${{ steps.pr-number.outputs.PR_NUMBER }}
 
   is-release:
     name: Determine whether this is a release merge commit

From b6f04df54e84415b3cda71e30d2b2b8b157da49e Mon Sep 17 00:00:00 2001
From: Maarten Zuidhoorn <maarten@zuidhoorn.com>
Date: Thu, 13 Nov 2025 19:44:13 +0100
Subject: [PATCH 8/9] Determine target branch for comparison based on event
 name

---
 .github/actions/check-release/action.yml | 27 +++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/.github/actions/check-release/action.yml b/.github/actions/check-release/action.yml
index d336569b896..ea8260e0cec 100644
--- a/.github/actions/check-release/action.yml
+++ b/.github/actions/check-release/action.yml
@@ -14,10 +14,27 @@ runs:
       with:
         fetch-depth: 0
 
+    - name: Get target reference
+      id: get-target
+      shell: bash
+      env:
+        EVENT_NAME: ${{ github.event_name }}
+      run: |
+        if [ "$EVENT_NAME" = "pull_request" ]; then
+          echo "TARGET=$(git merge-base HEAD refs/remotes/origin/main)" >> "$GITHUB_OUTPUT"
+        elif [ "$EVENT_NAME" = "merge_group" ]; then
+          echo "TARGET=$(git rev-parse HEAD^)" >> "$GITHUB_OUTPUT"
+        else
+          echo "::error::This action only supports `pull_request` and `merge_group` events."
+          exit 1
+        fi
+
     - name: Check commits for changes in released packages
       shell: bash
       env:
+        GH_TOKEN: ${{ github.token }}
         PULL_REQUEST: ${{ inputs.pull-request }}
+        TARGET: ${{ steps.get-target.outputs.TARGET }}
       run: |
         set -euo pipefail
         git fetch origin main
@@ -38,14 +55,14 @@ runs:
           fi
         done
 
-        # Get all files changed ahead of this PR.
+        # Fetch the pull request branch to compare changes.
         PULL_REQUEST_BRANCH=$(gh pr view "$PULL_REQUEST" --json headRefName --template "{{ .headRefName }}")
-
         echo "🔍 Checking for release conflicts with files changed ahead of PR branch \`$PULL_REQUEST_BRANCH\`..."
-
         git fetch origin "$PULL_REQUEST_BRANCH"
-        BEFORE=$(git merge-base "refs/remotes/origin/main" "$PULL_REQUEST_BRANCH")
-        git diff --name-only "$BEFORE..refs/remotes/origin/main" > changed-files.txt
+
+        # Get all files changed ahead of this PR.
+        BEFORE=$(git merge-base "refs/remotes/origin/main" "origin/$PULL_REQUEST_BRANCH")
+        git diff --name-only "$BEFORE..$TARGET" > changed-files.txt
 
         CONFLICTS=()
         for package in "${RELEASED_PACKAGES[@]}"; do

From babd67a7796e0f8638a4ac6ffaac673f601b4d85 Mon Sep 17 00:00:00 2001
From: Maarten Zuidhoorn <maarten@zuidhoorn.com>
Date: Thu, 13 Nov 2025 22:26:28 +0100
Subject: [PATCH 9/9] Escape backticks

---
 .github/actions/check-release/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/check-release/action.yml b/.github/actions/check-release/action.yml
index ea8260e0cec..6718629d1f0 100644
--- a/.github/actions/check-release/action.yml
+++ b/.github/actions/check-release/action.yml
@@ -25,7 +25,7 @@ runs:
         elif [ "$EVENT_NAME" = "merge_group" ]; then
           echo "TARGET=$(git rev-parse HEAD^)" >> "$GITHUB_OUTPUT"
         else
-          echo "::error::This action only supports `pull_request` and `merge_group` events."
+          echo "::error::This action only supports \`pull_request\` and \`merge_group\` events."
           exit 1
         fi