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

chore: update

Browse Source
This commit is contained in:
Z.X.PING
2025-09-14 22:16:45 +08:00
parent 88c699673c b0e51ed39f
commit faf18877b4
38 changed files with 468 additions and 14071 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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