ci(workflow): 添加 base-uv-ui 和 base-uview-plus 的自动合并工作流
添加两个新的工作流用于将 main 分支自动合并到 base-uv-ui 和 base-uview-plus 分支
This commit is contained in:
parent
2000eda414
commit
cfe5634c91
36
.github/workflows/auto-merge.yml
vendored
36
.github/workflows/auto-merge.yml
vendored
@ -42,3 +42,39 @@ jobs:
|
|||||||
git checkout base-sard-ui
|
git checkout base-sard-ui
|
||||||
git merge main --no-ff -m "Auto merge main into base-sard-ui"
|
git merge main --no-ff -m "Auto merge main into base-sard-ui"
|
||||||
git push origin base-sard-ui
|
git push origin base-sard-ui
|
||||||
|
|
||||||
|
merge-to-base-uv-ui:
|
||||||
|
name: Merge main into base-uv-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-uv-ui
|
||||||
|
run: |
|
||||||
|
git config user.name "GitHub Actions"
|
||||||
|
git config user.email "actions@github.com"
|
||||||
|
git checkout base-uv-ui
|
||||||
|
git merge main --no-ff -m "Auto merge main into base-uv-ui"
|
||||||
|
git push origin base-uv-ui
|
||||||
|
|
||||||
|
merge-to-base-uview-plus:
|
||||||
|
name: Merge main into base-uview-plus
|
||||||
|
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-uview-plus
|
||||||
|
run: |
|
||||||
|
git config user.name "GitHub Actions"
|
||||||
|
git config user.email "actions@github.com"
|
||||||
|
git checkout base-uview-plus
|
||||||
|
git merge main --no-ff -m "Auto merge main into base-uview-plus"
|
||||||
|
git push origin base-uview-plus
|
||||||
|
1
.vscode/settings.json
vendored
1
.vscode/settings.json
vendored
@ -41,6 +41,7 @@
|
|||||||
"tabbar",
|
"tabbar",
|
||||||
"Toutiao",
|
"Toutiao",
|
||||||
"unibest",
|
"unibest",
|
||||||
|
"uview",
|
||||||
"uvui",
|
"uvui",
|
||||||
"Wechat",
|
"Wechat",
|
||||||
"WechatMiniprogram",
|
"WechatMiniprogram",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user