diff --git a/.github/workflows/fetch.yml b/.github/workflows/fetch.yml index e67c95f6..4faac05a 100644 --- a/.github/workflows/fetch.yml +++ b/.github/workflows/fetch.yml @@ -3,7 +3,7 @@ name: Merge upstream branches on: schedule: - - cron: '* * * * *' + - cron: '5 * * * *' workflow_dispatch: jobs: merge: @@ -17,7 +17,8 @@ jobs: git clone https://${{ secrets.PERSONAL_TOKEN }}@github.com/Ryananana/sing-box.git tmp cd tmp git remote add upstream https://github.com/SagerNet/sing-box.git - git reset . - git fetch upstream + git fetch --all + git reset --hard origin/dev-next + git pull git merge upstream/dev-next git push origin dev-next