Merge branch 'feat/backset.cn-dev-2.1' into release/1.0

.drone.yml

@@ -1,7 +1,7 @@
 ---
 kind: pipeline
 type: docker
-name: admin & web 资源发布
+name: admin 资源发布
 
 volumes:
   - name: node_modules
@@ -14,6 +14,48 @@ when:
   event:
     - push
 
+steps:
+  # admin管理
+  - name: build-admin
+    image: node:16.19-alpine
+    volumes:
+      - name: node_modules
+        path: /drone/src/node_modules
+    commands:
+      - pwd
+      - node -v
+      - npm -v
+      - npm install -g pnpm
+      - pnpm i
+      - pnpm build:admin
+
+  - name: deploy-admin
+    image: appleboy/drone-scp:1.6
+    settings:
+      host:
+        - backset.cn
+      username: root
+      password: cr654654.
+      port: 22
+      overwrite: true
+      command_timeout: 2m
+      target: /www/wwwroot/nginx/html/backset.cn/
+      source: ./apps/admin/dist/*
+
+trigger:
+  branch:
+    - release/**
+
+---
+kind: pipeline
+type: docker
+name: web 资源发布
+
+volumes:
+  - name: node_modules
+    host:
+      path: /home/drone/cache/node_modules
+
 steps:
   # web端
   - name: build-web
@@ -43,32 +85,9 @@ steps:
       target: /www/wwwroot/nginx/html/backset.cn/
       source: ./apps/web/dist/*
 
-  # admin管理
+trigger:
-  - name: build-admin
+  branch:
-    image: node:16.19-alpine
+    - release/**
-    volumes:
-      - name: node_modules
-        path: /drone/src/node_modules
-    commands:
-      - pwd
-      - node -v
-      - npm -v
-      - npm install -g pnpm
-      - pnpm i
-      - pnpm build:admin
-
-  - name: deploy-admin
-    image: appleboy/drone-scp:1.6
-    settings:
-      host:
-        - backset.cn
-      username: root
-      password: cr654654.
-      port: 22
-      overwrite: true
-      command_timeout: 2m
-      target: /www/wwwroot/nginx/html/backset.cn/
-      source: ./apps/admin/dist/*
 
 ---
 kind: pipeline
@@ -83,3 +102,7 @@ steps:
   - name: docker container
     commands:
       - docker-compose up -d
+
+trigger:
+  branch:
+    - release/**