Merge branch 'base'

This commit is contained in:
feige996 2025-05-22 19:01:09 +08:00
commit 9883fbe7f0
4 changed files with 8 additions and 8 deletions

2
.github/release.yml vendored
View File

@ -28,4 +28,4 @@ categories:
- title: '🎨 格式化' - title: '🎨 格式化'
labels: ['format'] labels: ['format']
- title: '🔀 其他' - title: '🔀 其他'
labels: ['other', 'misc'] labels: ['other', 'misc']

View File

@ -10,11 +10,11 @@ jobs:
auto-merge: auto-merge:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
# - name: Checkout repository - name: Checkout repository
# uses: actions/checkout@v3 uses: actions/checkout@v4
# with: with:
# fetch-depth: 0 fetch-depth: 0
# token: ${{ secrets.GH_TOKEN_AUTO_MERGE2 }} token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
- name: Merge main into aliyun - name: Merge main into aliyun
run: | run: |

View File

@ -116,4 +116,4 @@ jobs:
with: with:
generateReleaseNotes: false generateReleaseNotes: false
bodyFile: changelog.md bodyFile: changelog.md
tag: ${{ github.ref_name }} tag: ${{ github.ref_name }}

View File

@ -1,7 +1,7 @@
{ {
"name": "unibest", "name": "unibest",
"type": "commonjs", "type": "commonjs",
"version": "2.8.0", "version": "2.8.1",
"description": "unibest - 最好的 uniapp 开发模板", "description": "unibest - 最好的 uniapp 开发模板",
"author": { "author": {
"name": "feige996", "name": "feige996",