Fix code formatting workflows

TimoWilken · davidrohr · commit f13068bb1aa8 · 2021-12-09T16:56:40.000+01:00
If there are no files to process, don't fail, and make sure to mark the PR as
"clean".
diff --git a/.github/workflows/code-formatting.yml b/.github/workflows/code-formatting.yml
@@ -47,8 +47,12 @@ jobs:
         # the branch we are merging into.
         BASE_COMMIT=$(git merge-base HEAD ${{ github.event.pull_request.base.sha }})
         echo "Running clang-format against branch ${{ github.event.pull_request.base.ref }}, with hash ${{ github.event.pull_request.base.sha }}"
-        COMMIT_FILES=$(git diff --diff-filter d --name-only $BASE_COMMIT | grep -ivE 'LinkDef|Utilities/PCG/')
-        [ "X$COMMIT_FILES" = X ] && { echo "No files to check" ; exit 0; }
+        COMMIT_FILES=$(git diff --diff-filter d --name-only "$BASE_COMMIT" -- ':!*LinkDef*' ':!Utilities/PCG/')
+        if [ -z "$COMMIT_FILES" ]; then
+          echo "No files to check" >&2
+          echo ::set-output name=clean::true
+          exit 0
+        fi
         RESULT_OUTPUT="$(git-clang-format --commit $BASE_COMMIT --diff --style file $COMMIT_FILES)"
 
         for x in $COMMIT_FILES; do
diff --git a/.github/workflows/code-transformations.yml b/.github/workflows/code-transformations.yml
@@ -42,9 +42,12 @@ jobs:
         BASE_COMMIT=$(git merge-base HEAD ${{ github.event.pull_request.base.sha }})
         echo "Running refactoring against branch ${{ github.event.pull_request.base.ref }}, with hash ${{ github.event.pull_request.base.sha }}"
         COMMIT_FILES=$(git diff --diff-filter d --name-only $BASE_COMMIT)
-        [ "X$COMMIT_FILES" = X ] && { echo "No files to check" ; exit 0; }
+        if [ -z "$COMMIT_FILES" ]; then
+          echo "No files to check" >&2
+          echo ::set-output name=clean::true
+          exit 0
+        fi
         perl -p -i -e "${{ env.REFACTORING }}" $COMMIT_FILES
-        RESULT_OUTPUT="$(git diff)"
 
         if git diff --exit-code; then
           echo "Refactoring not needed."
