a

233dada · Oct 9, 2024 · 5d41900 · 5d41900
1 parent 41a2e59
commit 5d41900
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 16 deletions.
diff --git a/.github/workflows/Scheduled-Merge-Remote-Action.yml b/.github/workflows/Scheduled-Merge-Remote-Action.yml
@@ -0,0 +1,25 @@
+name: Scheduled Merge Remote Action
+
+on:
+  push:
+    branches:
+      - master
+
+  #schedule:
+    #- cron: '0 14 * * *'
+
+jobs:
+  merge-upstream:
+    runs-on: ubuntu-latest
+    steps: 
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          ref: master             # set the branch to merge to
+          fetch-depth: 0 
+      - name: Merge Upstream
+        uses: exions/merge-upstream@v1
+        with:
+          upstream: userXinos/HadesSpace      # set the upstream repo
+          upstream-branch: master   # set the upstream branch to merge from
+          branch: master          # set the branch to merge to
diff --git a/.github/workflows/auto-pull.yml b/.github/workflows/auto-pull.yml