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

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

diff --git a/蜂蜜TV自己打包/同步dev.yml b/蜂蜜TV自己打包/同步dev.yml
new file mode 100644
index 0000000..7ca363b
--- /dev/null
+++ b/蜂蜜TV自己打包/同步dev.yml
@@ -0,0 +1,30 @@
+name: Merge upstream dev→dev
+
+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 'dlgt7'
+          git config --global user.email 'dlgt7@gmail.com'
+          git pull --unshallow
+          # 自行替换要同步的上游仓库地址
+          git remote add upstream https://github.com/FongMi/TV.git
+          git fetch upstream
+          git checkout --track origin/dev
+          git merge upstream/dev
+          git pull origin dev
+          git push origin dev
+         
+