From a5fc7b8160daf2e0282d510f34ab8871b96df663 Mon Sep 17 00:00:00 2001 From: laifeipeng <1020103647@qq.com> Date: Tue, 22 Apr 2025 14:47:32 +0800 Subject: [PATCH] build: auto-merge spa --- .github/workflows/auto-merge.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 54aea51..8efc862 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -39,3 +39,11 @@ jobs: git checkout tabbar git merge base --no-ff -m "Auto merge base into tabbar" git push origin tabbar + + - name: Merge base into spa + run: | + git config user.name "GitHub Actions" + git config user.email "actions@github.com" + git checkout spa + git merge base --no-ff -m "Auto merge base into spa" + git push origin spa