Move script to separate action and run for PRs

Author: Mrtenz

.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

.github/workflows/check-release.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 }}