diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 0c12579..f548d8b 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -7,24 +7,6 @@ on: workflow_dispatch: # 手动触发 jobs: - merge-to-main: - name: Merge base into main - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - fetch-depth: 0 - token: ${{ secrets.GH_TOKEN_AUTO_MERGE }} - - - name: Merge base into main - 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 - merge-to-i18n: name: Merge base into i18n runs-on: ubuntu-latest