Update and rename main.yml to fetch.yml

Signed-off-by: Ryananana <36809659+Ryananana@users.noreply.github.com>

.github/workflows/fetch.yml

@@ -0,0 +1,22 @@
+# .github/workflows/fetch.yml
+
+name: Merge upstream branches
+on:
+  schedule:
+    - cron:  '* * * * *'
+  workflow_dispatch:
+jobs:
+  merge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Merge upstream
+        run: |
+          git config --global user.name 'Ryananana'
+          git config --global user.email '36809659+Ryananana@users.noreply.github.com'
+          git config --global credential.helper store
+          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 fetch upstream
+          git merge upstream/dev-next
+          git push origin dev-next

.github/workflows/main.yml

@@ -1,19 +0,0 @@
-name: Sync Fork
-
-on:
-  schedule:
-    - cron: '*/30 * * * *' # every 30 minutes
-  workflow_dispatch: # on button click
-
-jobs:
-  sync:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: tgymnich/fork-sync@v1.8
-        with:
-          token: ${{ secrets.PERSONAL_TOKEN }}
-          owner: SagerNet
-          base: dev-next
-          head: dev-next