From 435417c0d51a2cc63d3d1b76f0682f6dc9224c74 Mon Sep 17 00:00:00 2001
From: dlgt7 <102397160+dlgt7@users.noreply.github.com>
Date: Thu, 21 Dec 2023 20:08:13 +0800
Subject: [PATCH] =?UTF-8?q?Create=20=E5=90=8C=E6=AD=A5release.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 蜂蜜TV自己打包/同步release.yml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 蜂蜜TV自己打包/同步release.yml

diff --git a/蜂蜜TV自己打包/同步release.yml b/蜂蜜TV自己打包/同步release.yml
new file mode 100644
index 0000000..071a173
--- /dev/null
+++ b/蜂蜜TV自己打包/同步release.yml
@@ -0,0 +1,28 @@
+name: Merge upstream release→release
+
+on:
+  # 推送代码后触发
+  push:
+  # 定时任务触发，使用 cron 规则，这里默认一小时执行一次
+  schedule:
+    - cron: '0 * * * *'
+  workflow_dispatch:
+
+jobs:
+  merge:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Merge upstream
+        run: |
+          # 使用自己的用户名替换 username
+          git config --global user.name 'xyzjhe'
+          git config --global user.email 'lao@gmail.com'
+          git pull --unshallow
+          # 自行替换要同步的上游仓库地址
+          git remote add upstream https://github.com/FongMi/TV.git
+          git fetch upstream
+          git checkout release
+          git merge upstream/release
+          git pull origin release
+          git push origin release