From 5d419009943cce6ee2a26f14271bf3bc6c040092 Mon Sep 17 00:00:00 2001
From: 233dada <233dada@gmail.com>
Date: Thu, 10 Oct 2024 00:25:51 +0800
Subject: [PATCH] a

---
 .../Scheduled-Merge-Remote-Action.yml         | 25 +++++++++++++++++++
 .github/workflows/auto-pull.yml               | 16 ------------
 2 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 .github/workflows/Scheduled-Merge-Remote-Action.yml
 delete mode 100644 .github/workflows/auto-pull.yml

diff --git a/.github/workflows/Scheduled-Merge-Remote-Action.yml b/.github/workflows/Scheduled-Merge-Remote-Action.yml
new file mode 100644
index 00000000..2a662f6e
--- /dev/null
+++ 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
deleted file mode 100644
index f6ee8c2f..00000000
--- a/.github/workflows/auto-pull.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: auto pull
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: pull code
-        run: git pull upstream master --rebase