From 9f9c920dacbdc309831fe235a58967227261775b Mon Sep 17 00:00:00 2001
From: "Duong M. CUONG" <thestar.illuminate.92@gmail.com>
Date: Thu, 12 Oct 2023 10:11:08 +0900
Subject: [PATCH 1/2] Create production deploy action

Automatically merge from main to production 00:15 every day
---
 .github/workflows/prod-deploy.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .github/workflows/prod-deploy.yml

diff --git a/.github/workflows/prod-deploy.yml b/.github/workflows/prod-deploy.yml
new file mode 100644
index 00000000000..b787ebdd4b6
--- /dev/null
+++ b/.github/workflows/prod-deploy.yml
@@ -0,0 +1,22 @@
+name: Merge to production
+
+permissions:
+  contents: write
+
+on:
+  schedule:
+    - cron: "15 0 * * *" # 00:15 every day
+  workflow_dispatch:
+
+jobs:
+  merge_to_prod:
+    name: Merge from main branch to production branch
+    runs-on: ubuntu-latest
+    if: ${{ github.event.repository.fork }}
+    steps:
+      - name: Merge branch
+        uses: devmasx/merge-branch@1.4.0
+        with:
+          target_branch: production
+          from_branch: main
+          github_token: ${{ secrets.GITHUB_TOKEN }}

From f8f8a66a9efc314f3c399e2b9c5f594695cb360f Mon Sep 17 00:00:00 2001
From: "Duong M. CUONG" <thestar.illuminate.92@gmail.com>
Date: Tue, 17 Oct 2023 10:40:38 +0900
Subject: [PATCH 2/2] Remove sync workflow from production branch

---
 .github/workflows/sync.yml | 40 --------------------------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 .github/workflows/sync.yml

diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
deleted file mode 100644
index ebf5587d07c..00000000000
--- a/.github/workflows/sync.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: Upstream Sync
-
-permissions:
-  contents: write
-
-on:
-  schedule:
-    - cron: "0 0 * * *" # every day
-  workflow_dispatch:
-
-jobs:
-  sync_latest_from_upstream:
-    name: Sync latest commits from upstream repo
-    runs-on: ubuntu-latest
-    if: ${{ github.event.repository.fork }}
-
-    steps:
-      # Step 1: run a standard checkout action
-      - name: Checkout target repo
-        uses: actions/checkout@v3
-
-      # Step 2: run the sync action
-      - name: Sync upstream changes
-        id: sync
-        uses: aormsby/Fork-Sync-With-Upstream-action@v3.4
-        with:
-          upstream_sync_repo: Yidadaa/ChatGPT-Next-Web
-          upstream_sync_branch: main
-          target_sync_branch: main
-          target_repo_token: ${{ secrets.GITHUB_TOKEN }} # automatically generated, no need to set
-
-          # Set test_mode true to run tests instead of the true action!!
-          test_mode: false
-
-      - name: Sync check
-        if: failure()
-        run: |
-          echo "[Error] 由于上游仓库的 workflow 文件变更，导致 GitHub 自动暂停了本次自动更新，你需要手动 Sync Fork 一次，详细教程请查看：https://github.com/Yidadaa/ChatGPT-Next-Web/blob/main/README_CN.md#%E6%89%93%E5%BC%80%E8%87%AA%E5%8A%A8%E6%9B%B4%E6%96%B0"
-          echo "[Error] Due to a change in the workflow file of the upstream repository, GitHub has automatically suspended the scheduled automatic update. You need to manually sync your fork. Please refer to the detailed tutorial for instructions: https://github.com/Yidadaa/ChatGPT-Next-Web#enable-automatic-updates"
-          exit 1