From 722ed15017e60320ee708c5e28a1abcd32e5c70f Mon Sep 17 00:00:00 2001 From: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com> Date: Sat, 20 Jul 2024 16:01:41 -0400 Subject: [PATCH] Revert "Merge branch 'main' of https://github.com/PokeRogue-Projects/Pathing-Tool" This reverts commit e522348462086ec4d4b51cc5e928f502b9e0a1fc, reversing changes made to a027ea40fae0109c22c71ecb622ec213337b794b. --- .github/workflows/auto-update.yml | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 .github/workflows/auto-update.yml diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml deleted file mode 100644 index 6f5cfd5ef46..00000000000 --- a/.github/workflows/auto-update.yml +++ /dev/null @@ -1,31 +0,0 @@ -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