From d4d89097e5659dc0351de8db2c00b78e22807419 Mon Sep 17 00:00:00 2001
From: chenos <chenlinxh@gmail.com>
Date: Tue, 16 Jul 2024 08:59:25 +0800
Subject: [PATCH] chore: auto merge

---
 .github/workflows/auto-merge.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/workflows/auto-merge.yml

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
new file mode 100644
index 0000000000..beed7eb65c
--- /dev/null
+++ b/.github/workflows/auto-merge.yml
@@ -0,0 +1,27 @@
+name: auto-merge
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+on:
+  push:
+
+jobs:
+  push-commit:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          repository: nocobase/nocobase
+          ssh-key: ${{ secrets.NOCOBASE_DEPLOY_KEY }}
+          persist-credentials: true
+          fetch-depth: 0
+      - name: Merge main -> next
+        uses: devmasx/merge-branch@master
+        with:
+          type: now
+          from_branch: main
+          target_branch: ${{ github.head_ref || github.ref_name }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}