Create Merge-upstream.yml

Author: edgetoo

.github/workflows/Merge-upstream.yml

@@ -0,0 +1,39 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Merge-upstream
+
+# Controls when the action will run. Triggers the workflow on push or pull request 
+# events but only for the master branch
+on:
+  # push:
+  #  branches: 
+  #    - master
+  schedule:
+    - cron: 0 7 * * 2
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  merge:
+
+    runs-on: ubuntu-latest
+
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@master
+      with:
+        ref: master
+        fetch-depth: 0
+        lfs: true
+
+    - name: Set git identity
+      run : |
+        git config --global user.email "edgetoo.163.com"
+        git config --global user.name "Edgetoo"
+    - name: Load upstream commits
+      run: git pull https://github.com/ngosang/trackerslist.git --no-edit --strategy-option ours
+
+    - name: Push Commits
+      env:
+        DOWNSTREAM_BRANCH: master
+      run: git push origin $DOWNSTREAM_BRANCH