合并分支 'zym-dev' 到 'pre'

.gitlab-ci.yml

@@ -2,10 +2,12 @@ stages:
   - build
   - deploy
 
-# cache:
-#   key: "$CI_COMMIT_REF_SLUG"
-#   paths:
-#     - .npm/
+cache:
+  # cache:key 这里使用字符串，兼容性更好（部分 linter 不支持 key: { files: [...] }）
+  key: "npm-cache-$CI_COMMIT_REF_SLUG"
+  paths:
+    - .npm/
+  policy: pull-push
 
 build_pre:
   stage: build
@@ -17,8 +19,7 @@ build_pre:
   script:
     - node -v
     - npm -v
-    - npm config set cache .npm --global
-    - npm ci --prefer-offline --no-audit --no-fund
+    - npm ci --cache "$CI_PROJECT_DIR/.npm" --prefer-offline --no-audit --no-fund
     - npm run build
   artifacts:
     paths:
@@ -35,5 +36,47 @@ deploy_pre:
   dependencies:
     - build_pre
   script:
-    - apk add --no-cache rsync
-    - rsync -av --delete dist/ /nas/kjb_service/zm/pre-project/html/
+    - apk add --no-cache rsync curl jq
+    # 只允许“最新一次 pre pipeline”部署到 nginx（加二次确认，避免短时间多次推送导致重复 rsync）
\ No newline at end of file
+    - >
+      LATEST_PIPELINE_ID="$(
+      curl --silent --show-error --fail
+      --header "JOB-TOKEN: $CI_JOB_TOKEN"
+      "$CI_SERVER_URL/api/v4/projects/$CI_PROJECT_ID/pipelines?ref=pre&order_by=id&sort=desc&per_page=1"
+      | jq -r '.[0].id'
+      )"
+    - >
+      if [ -z "$LATEST_PIPELINE_ID" ] || [ "$LATEST_PIPELINE_ID" != "$CI_PIPELINE_ID" ]; then
+        echo "skip deploy: not latest pipeline (latest=$LATEST_PIPELINE_ID current=$CI_PIPELINE_ID)";
+        exit 0;
+      fi
+    - sleep 20
+    - >
+      LATEST_PIPELINE_ID="$(
+      curl --silent --show-error --fail
+      --header "JOB-TOKEN: $CI_JOB_TOKEN"
+      "$CI_SERVER_URL/api/v4/projects/$CI_PROJECT_ID/pipelines?ref=pre&order_by=id&sort=desc&per_page=1"
+      | jq -r '.[0].id'
+      )"
+    - >
+      if [ -z "$LATEST_PIPELINE_ID" ] || [ "$LATEST_PIPELINE_ID" != "$CI_PIPELINE_ID" ]; then
+        echo "skip deploy: not latest pipeline after debounce (latest=$LATEST_PIPELINE_ID current=$CI_PIPELINE_ID)";
+        exit 0;
+      fi
+    - rsync -av --delete dist/ /nas/kjb_service/zm/pre-project/html/
+
+# 非 protected 分支：push 时先做 build 校验（避免合并 pre 时出现 build 报错）
+build_check:
+  stage: build
+  image: node:20-bullseye
+  tags:
+    - risk-monitor-frontend
+  only:
+    - branches
+  except:
+    - protected_branches
+  script:
+    - node -v
+    - npm -v
+    - npm ci --cache "$CI_PROJECT_DIR/.npm" --prefer-offline --no-audit --no-fund
+    - npm run build
\ No newline at end of file