diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 339c0a2..bd254bc 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -132,3 +132,39 @@ jobs: git checkout base-skiyee-ui git merge main --no-ff -m "Auto merge main into base-skiyee-ui" git push origin base-skiyee-ui + + merge-to-main-v4: + name: Merge main into main-v4 + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.GH_TOKEN_AUTO_MERGE }} + + - name: Merge main into main-v4 + run: | + git config user.name "GitHub Actions" + git config user.email "actions@github.com" + git checkout main-v4 + git merge main --no-ff -m "Auto merge main into main-v4" + git push origin main-v4 + + merge-to-i18n-v4: + name: Merge main into i18n-v4 + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.GH_TOKEN_AUTO_MERGE }} + + - name: Merge main into i18n-v4 + run: | + git config user.name "GitHub Actions" + git config user.email "actions@github.com" + git checkout i18n-v4 + git merge main --no-ff -m "Auto merge main into i18n-v4" + git push origin i18n-v4