chunyu/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-06-13 21:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update fetch.yml

Browse Source 
Signed-off-by: Ryananana <36809659+Ryananana@users.noreply.github.com>
This commit is contained in:
Ryananana 2024-05-20 21:29:15 +08:00 committed by GitHub
parent d13da69b7a
commit 3f9dd9719f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/fetch.yml vendored
View File

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