Abort if resulting pull would end up with no changes

EIGHTFINITE · Sep 29, 2023 · e53903f · e53903f
1 parent 6dd0bf4
commit e53903f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -9,6 +9,7 @@ permissions: write-all
 jobs:
   package_json:
     runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' || github.actor == 'renovate[bot]' }}
     steps:
     - uses: actions/[email protected]
       continue-on-error: true
@@ -26,7 +27,7 @@ jobs:
           git add package.json
           git -c user.name="GitHub" -c user.email="[email protected]" commit --author="github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>" -m"Fix package.json" | sed -n 1p || true
           git push
-          if [[ $(git status --porcelain | tee /dev/stderr | head -c1 | wc -c) -ne 0 || $(git clean -dffx | tee /dev/stderr | head -c1 | wc -c) -ne 0 ]]; then
+          if [[ $(git diff --stat $(git log -1 --skip=2 --format=%H) $(git log -1 --format=%H)) -eq 0 || $(git status --porcelain | tee /dev/stderr | head -c1 | wc -c) -ne 0 || $(git clean -dffx | tee /dev/stderr | head -c1 | wc -c) -ne 0 ]]; then
             exit 1
           fi
         fi
@@ -48,7 +49,7 @@ jobs:
   close:
     runs-on: ubuntu-latest
     needs: package_json
-    if: ${{ github.actor == 'renovate[bot]' && needs.package_json.result == 'success' }}
+    if: ${{ (github.actor == 'renovate[bot]' && needs.package_json.result == 'success') || (github.actor == 'dependabot[bot]' && needs.package_json.result == 'failure') }}
     steps:
     - name: Close Pull
       uses: peter-evans/[email protected]