Fix CICD

Author: tier940

.github/workflows/build_and_test.yml

@@ -58,7 +58,7 @@ jobs:
         if: ${{ failure() && steps.build_mod.conclusion == 'failure' && github.event_name == 'pull_request' && !github.event.pull_request.draft }}
         run: |
           git reset --hard
-          git checkout "${PR_BRANCH}"
+          git checkout "${github.ref_name}"
           ./gradlew --info spotlessApply || exit 1
           git diff --exit-code && exit 1
           git config user.name "GitHub Actions"
@@ -68,15 +68,14 @@ jobs:
           git push --force-with-lease origin "${FIXED_BRANCH}"
           gh pr create \
             --head "${FIXED_BRANCH}" \
-            --base "${PR_BRANCH}" \
+            --base "${github.ref_name}" \
             --title "Spotless apply for branch ${{ github.event.pull_request.head.ref }} for #${{ github.event.pull_request.number }}" \
             --body "Automatic spotless apply to fix formatting errors, applies to PR #${{ github.event.pull_request.number }}" \
             2>&1 | tee pr-message.log || true
-          gh pr comment "${PR_BRANCH}" -F pr-message.log || true
+          gh pr comment "${github.ref_name}" -F pr-message.log || true
         shell: bash # ensures set -eo pipefail
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PR_BRANCH: ${{ github.head_ref }}
           FIXED_BRANCH: ${{ github.head_ref }}-spotless-fixes
 
       - name: Run server for ${{ inputs.timeout }} seconds

.github/workflows/format_java.yml

@@ -36,7 +36,7 @@ jobs:
         run: ./gradlew --info spotlessCheck
 
       - name: Attempt to make a PR fixing spotless errors
-        if: failure()
+        if: failure() && steps.build.conclusion == 'failure'
         run: |
           git reset --hard
           git checkout "${PR_BRANCH}"