From d86bfa719d5c270fa26b23deef8ac962a35a0c5e Mon Sep 17 00:00:00 2001 From: feige996 <1020102647@qq.com> Date: Sat, 21 Jun 2025 10:52:02 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E5=B0=86=E8=87=AA=E5=8A=A8=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E5=B7=A5=E4=BD=9C=E6=B5=81=E4=B8=AD=E7=9A=84=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E5=88=86=E6=94=AF=E4=BB=8Ebase=E6=94=B9=E4=B8=BAmain?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/auto-merge.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index f548d8b..e9baabc 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -1,14 +1,14 @@ -name: Auto Merge Base to Other Branches +name: Auto Merge Main to Other Branches on: push: branches: - - base + - main workflow_dispatch: # 手动触发 jobs: merge-to-i18n: - name: Merge base into i18n + name: Merge main into i18n runs-on: ubuntu-latest steps: - name: Checkout repository @@ -17,16 +17,16 @@ jobs: fetch-depth: 0 token: ${{ secrets.GH_TOKEN_AUTO_MERGE }} - - name: Merge base into i18n + - name: Merge main 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 merge main --no-ff -m "Auto merge main into i18n" git push origin i18n merge-to-tabbar: - name: Merge base into tabbar + name: Merge main into tabbar runs-on: ubuntu-latest steps: - name: Checkout repository @@ -35,16 +35,16 @@ jobs: fetch-depth: 0 token: ${{ secrets.GH_TOKEN_AUTO_MERGE }} - - name: Merge base into tabbar + - name: Merge main 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 merge main --no-ff -m "Auto merge main into tabbar" git push origin tabbar merge-to-spa: - name: Merge base into spa + name: Merge main into spa runs-on: ubuntu-latest steps: - name: Checkout repository @@ -53,10 +53,10 @@ jobs: fetch-depth: 0 token: ${{ secrets.GH_TOKEN_AUTO_MERGE }} - - name: Merge base into spa + - name: Merge main 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 merge main --no-ff -m "Auto merge main into spa" git push origin spa