From ede06b367d9892788e61a473df460e62e4dfc403 Mon Sep 17 00:00:00 2001 From: feige996 <1020102647@qq.com> Date: Fri, 15 Aug 2025 10:10:54 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E6=B7=BB=E5=8A=A0=E5=B0=86main=E5=88=86?= =?UTF-8?q?=E6=94=AF=E8=87=AA=E5=8A=A8=E5=90=88=E5=B9=B6=E5=88=B0base-uvie?= =?UTF-8?q?w-pro=E7=9A=84=E5=B7=A5=E4=BD=9C=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/auto-merge.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index bd254bc..2860d0f 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -79,6 +79,24 @@ jobs: git merge main --no-ff -m "Auto merge main into base-uv-ui" git push origin base-uv-ui + merge-to-base-uview-pro: + name: Merge main into base-uview-pro + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.GH_TOKEN_AUTO_MERGE }} + + - name: Merge main into base-uview-pro + run: | + git config user.name "GitHub Actions" + git config user.email "actions@github.com" + git checkout base-uview-pro + git merge main --no-ff -m "Auto merge main into base-uview-pro" + git push origin base-uview-pro + merge-to-base-uview-plus: name: Merge main into base-uview-plus runs-on: ubuntu-latest