소스 검색

Merge branch 'base'

feige996 11 달 전
부모
커밋
9883fbe7f0
4개의 변경된 파일8개의 추가작업 그리고 8개의 파일을 삭제
  1. 1 1
      .github/release.yml
  2. 5 5
      .github/workflows/auto-merge.yml
  3. 1 1
      .github/workflows/release.yml
  4. 1 1
      package.json

+ 1 - 1
.github/release.yml

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

+ 5 - 5
.github/workflows/auto-merge.yml

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

+ 1 - 1
.github/workflows/release.yml

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

+ 1 - 1
package.json

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