Merge branch 'check-for-changelog' into develop

mysociety · Nov 3, 2023 · bdd570c · bdd570c
2 parents 61c253f + 6e3e0aa
commit bdd570c
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,13 +29,15 @@ jobs:
     - name: Check for [skip rspec]
       id: skip
       run: |
-        PR_DESCRIPTION=$(gh pr view https://github.com/${{ github.repository }}/pull/${{ github.event.pull_request.number }} --json body -q '.body')
-        if echo "$PR_DESCRIPTION" | grep -q "\[skip rspec\]"; then
-          echo "Skip RSpec found in PR description. Passing the action."
-          echo "skip_rspec=true" >> $GITHUB_OUTPUT
-        else
-          echo "skip_rspec=false" >> $GITHUB_OUTPUT
+        if [ "${{ github.event_name }}" = "pull_request" ]; then
+          PR_DESCRIPTION=$(gh pr view https://github.com/${{ github.repository }}/pull/${{ github.event.pull_request.number }} --json body -q '.body')
+          if echo "$PR_DESCRIPTION" | grep -q "\[skip rspec\]"; then
+            echo "Skip RSpec found in PR description. Passing the action."
+            echo "skip_rspec=true" >> $GITHUB_OUTPUT
+            exit
+          fi
         fi
+        echo "skip_rspec=false" >> $GITHUB_OUTPUT
 
   rspec:
     name: Ruby ${{ matrix.ruby }} / PostgreSQL ${{ matrix.postgres }}