XW-AIOT/aiot-uniapp
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main'

Browse Source
This commit is contained in:
Z.X.PING
2025-09-01 00:54:14 +08:00
parent 833bcbbe7f cee7a6e747
commit 88c699673c
123 changed files with 9056 additions and 4542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
.github/workflows/auto-merge.yml vendored
View File

@@ -7,23 +7,23 @@ on:
workflow_dispatch: # 手动触发
jobs:
merge-to-release:
name: Merge main into release
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
# merge-to-release:
# name: Merge main into release
# 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 release
run: |
git config user.name "GitHub Actions"
git config user.email "actions@github.com"
git checkout release
git merge main --no-ff -m "Auto merge main into release"
git push origin release
# - name: Merge main into release
# run: |
# git config user.name "GitHub Actions"
# git config user.email "actions@github.com"
# git checkout release
# git merge main --no-ff -m "Auto merge main into release"
# git push origin release
merge-to-i18n:
name: Merge main into i18n
@@ -79,6 +79,24 @@ jobs:
git merge main --no-ff -m "Auto merge main into base-uv-ui"
git push origin base-uv-ui
merge-to-base-uview-pro:
name: Merge main into base-uview-pro
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-pro
run: |
git config user.name "GitHub Actions"
git config user.email "actions@github.com"
git checkout base-uview-pro
git merge main --no-ff -m "Auto merge main into base-uview-pro"
git push origin base-uview-pro
merge-to-base-uview-plus:
name: Merge main into base-uview-plus
runs-on: ubuntu-latest
@@ -96,3 +114,75 @@ jobs:
git checkout base-uview-plus
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 }}
- 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
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-skiyee-ui
run: |
git config user.name "GitHub Actions"
git config user.email "actions@github.com"
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