From 26564b841e8d3af66b2ae0c5808ba2d79046b035 Mon Sep 17 00:00:00 2001 From: KingRainbow44 Date: Tue, 16 May 2023 21:19:29 -0400 Subject: [PATCH] Fix force pushing to branches after linting --- .github/workflows/check_code.yml | 2 +- .github/workflows/handbook.yml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check_code.yml b/.github/workflows/check_code.yml index 29a740be3..637bb49ba 100644 --- a/.github/workflows/check_code.yml +++ b/.github/workflows/check_code.yml @@ -38,7 +38,7 @@ jobs: - run: git config --global user.name "github-actions" - run: git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" - run: git stash - - run: git checkout unstable + - run: git checkout unstable && git pull - run: git stash pop || true - name: Commit Code Changes diff --git a/.github/workflows/handbook.yml b/.github/workflows/handbook.yml index a4d8358cc..72dc1f3bc 100644 --- a/.github/workflows/handbook.yml +++ b/.github/workflows/handbook.yml @@ -44,12 +44,15 @@ jobs: - run: git config --global user.name "github-actions" - run: git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" + - run: git stash + - run: git checkout unstable && git pull + - run: git stash pop || true - name: Commit changes if: ${{ github.event_name == 'push' }} run: git add -u && git commit -m "Lint Code [skip actions]" || true - name: Push changes if: ${{ github.event_name == 'push' }} - run: git push --set-upstream --force origin ${{ github.ref }} + run: git push --set-upstream --force origin unstable Build-Handbook: runs-on: ubuntu-latest