From 23d87d82c01f3bfb9717d2d8125909b331bc51fd Mon Sep 17 00:00:00 2001 From: Burt Date: Tue, 14 Jan 2025 19:13:50 +0800 Subject: [PATCH] build: auto-merge.yml 2 --- .github/workflows/auto-merge.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index a99549c..27aea3d 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -13,21 +13,28 @@ jobs: uses: actions/checkout@v3 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 - 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