Merge pull request #76296 from akien-mga/ci-static-fixup-merge

CI: Fixup failure to get changed files on merge
godotengine · Apr 20, 2023 · 6f1a52b · 6f1a52b
2 parents 4abb7a6 + 9063e90
commit 6f1a52b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/static_checks.yml b/.github/workflows/static_checks.yml
@@ -30,9 +30,9 @@ jobs:
         id: changed-files
         run: |
           if [ "${{ github.event_name }}" == "pull_request" ]; then
-            files=$(git diff-tree --no-commit-id --name-only -r ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }} 2> /dev/null)
+            files=$(git diff-tree --no-commit-id --name-only -r ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }} 2> /dev/null || true)
           elif [ "${{ github.event_name }}" == "push" -a "${{ github.event.forced }}" == "false" -a "${{ github.event.created }}" == "false" ]; then
-            files=$(git diff-tree --no-commit-id --name-only -r ${{ github.event.before }}..${{ github.event.after }} 2> /dev/null)
+            files=$(git diff-tree --no-commit-id --name-only -r ${{ github.event.before }}..${{ github.event.after }} 2> /dev/null || true)
           fi
           echo "$files" >> changed.txt
           cat changed.txt