diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index a84e52e..0c12579 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -7,7 +7,8 @@ on: workflow_dispatch: # 手动触发 jobs: - auto-merge: + merge-to-main: + name: Merge base into main runs-on: ubuntu-latest steps: - name: Checkout repository @@ -24,6 +25,16 @@ jobs: 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 + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.GH_TOKEN_AUTO_MERGE }} + - name: Merge base into i18n run: | git config user.name "GitHub Actions" @@ -32,6 +43,16 @@ jobs: git merge base --no-ff -m "Auto merge base into i18n" git push origin i18n + merge-to-tabbar: + name: Merge base into tabbar + 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 tabbar run: | git config user.name "GitHub Actions" @@ -40,6 +61,16 @@ jobs: git merge base --no-ff -m "Auto merge base into tabbar" git push origin tabbar + merge-to-spa: + name: Merge base into spa + 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 spa run: | git config user.name "GitHub Actions" diff --git a/.github/workflows/release.yml b/.github/workflows/release-log.yml similarity index 100% rename from .github/workflows/release.yml rename to .github/workflows/release-log.yml