From 0c95957493cbb49fbd14dd206665d006a6bea82d Mon Sep 17 00:00:00 2001 From: feige996 <1020102647@qq.com> Date: Thu, 22 May 2025 15:39:27 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E7=AE=80=E5=8C=96=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=B7=A5=E4=BD=9C=E6=B5=81=EF=BC=8C=E4=BB=85?= =?UTF-8?q?=E5=90=88=E5=B9=B6main=E5=88=B0aliyun=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 简化了自动合并工作流，删除了对base分支的合并操作，仅保留将main分支合并到aliyun分支的步骤，以减少不必要的合并操作。 --- .github/workflows/auto-merge.yml | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 8efc862..ec554f8 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -16,34 +16,10 @@ jobs: fetch-depth: 0 token: ${{ secrets.GH_TOKEN_AUTO_MERGE }} - - name: Merge base into main + - name: Merge main into aliyun run: | git config user.name "GitHub Actions" git config user.email "actions@github.com" - git checkout main - git merge base --no-ff -m "Auto merge base into main" - git push origin main - - - name: Merge base into i18n - run: | - git config user.name "GitHub Actions" - git config user.email "actions@github.com" - git checkout i18n - git merge base --no-ff -m "Auto merge base into i18n" - git push origin i18n - - - name: Merge base into tabbar - run: | - git config user.name "GitHub Actions" - git config user.email "actions@github.com" - 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 + git checkout aliyun + git merge main --no-ff -m "Auto merge main into aliyun" + git push origin aliyun