|
@@ -24,3 +24,21 @@ jobs:
|
|
|
git checkout i18n
|
|
git checkout i18n
|
|
|
git merge main --no-ff -m "Auto merge main into i18n"
|
|
git merge main --no-ff -m "Auto merge main into i18n"
|
|
|
git push origin i18n
|
|
git push origin i18n
|
|
|
|
|
+
|
|
|
|
|
+ merge-to-base-sard-ui:
|
|
|
|
|
+ name: Merge main into base-sard-ui
|
|
|
|
|
+ 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 base-sard-ui
|
|
|
|
|
+ run: |
|
|
|
|
|
+ git config user.name "GitHub Actions"
|
|
|
|
|
+ git config user.email "actions@github.com"
|
|
|
|
|
+ git checkout base-sard-ui
|
|
|
|
|
+ git merge main --no-ff -m "Auto merge main into base-sard-ui"
|
|
|
|
|
+ git push origin base-sard-ui
|