From e76606f29922f8965e2c9be649c0e8551a722b4e Mon Sep 17 00:00:00 2001 From: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com> Date: Sat, 20 Jul 2024 16:15:53 -0400 Subject: [PATCH] Reapply "Merge branch 'main' of https://github.com/PokeRogue-Projects/Pathing-Tool" This reverts commit 722ed15017e60320ee708c5e28a1abcd32e5c70f. --- .github/workflows/auto-update.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/auto-update.yml diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml new file mode 100644 index 00000000000..6f5cfd5ef46 --- /dev/null +++ b/.github/workflows/auto-update.yml @@ -0,0 +1,31 @@ +name: Update Fork + +on: + schedule: + - cron: '0 0 * * *' # Runs every day at midnight + push: + branches: + - main + +jobs: + update-fork: + runs-on: ubuntu-latest + + steps: + - name: Checkout fork + uses: actions/checkout@v2 + with: + repository: PokeRogue-Projects/Pathing-Tool + ref: Automerge + + - name: Add upstream + run: git remote add upstream https://github.com/pagefaultgames/pokerogue.git + + - name: Fetch upstream + run: git fetch upstream + + - name: Merge upstream changes + run: | + git checkout main + git merge upstream/main + git push origin Automerge