|
|
@@ -115,23 +115,23 @@ jobs:
|
|
|
git merge main --no-ff -m "Auto merge main into base-uview-plus"
|
|
|
git push origin base-uview-plus
|
|
|
|
|
|
- merge-to-base-tm-ui:
|
|
|
- name: Merge main into base-tm-ui
|
|
|
- runs-on: ubuntu-latest
|
|
|
- steps:
|
|
|
- - name: Checkout repository
|
|
|
- uses: actions/checkout@v4
|
|
|
- with:
|
|
|
- fetch-depth: 0
|
|
|
- token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
|
|
|
+ # merge-to-base-tm-ui:
|
|
|
+ # name: Merge main into base-tm-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-tm-ui
|
|
|
- run: |
|
|
|
- git config user.name "GitHub Actions"
|
|
|
- git config user.email "actions@github.com"
|
|
|
- git checkout base-tm-ui
|
|
|
- git merge main --no-ff -m "Auto merge main into base-tm-ui"
|
|
|
- git push origin base-tm-ui
|
|
|
+ # - name: Merge main into base-tm-ui
|
|
|
+ # run: |
|
|
|
+ # git config user.name "GitHub Actions"
|
|
|
+ # git config user.email "actions@github.com"
|
|
|
+ # git checkout base-tm-ui
|
|
|
+ # git merge main --no-ff -m "Auto merge main into base-tm-ui"
|
|
|
+ # git push origin base-tm-ui
|
|
|
|
|
|
merge-to-base-skiyee-ui:
|
|
|
name: Merge main into base-skiyee-ui
|