From 86727655108f501e850943f5048c0249d2836a37 Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sat, 28 Jan 2023 19:56:29 +0000 Subject: [PATCH] Hotfix: miscopy in the actions spotless fix --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index f95161c..d1d2bff 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -68,7 +68,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 --theirs "${PR_BRANCH}" + git checkout "${PR_BRANCH}" ./gradlew --info --stacktrace spotlessApply || exit 1 git diff --exit-code && exit 1 git config user.name "GitHub GTNH Actions"