From 076e892df9899b89cb5f522f6e04f1d59027418a Mon Sep 17 00:00:00 2001 From: zlwu <704541015@qq.com> Date: Sat, 24 Oct 2026 11:09:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20Drone=20=E6=89=93=E5=8C=85=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E5=AF=B9=E8=87=AA=E5=AE=9A=E4=B9=89=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E4=BD=BF=E7=94=A8=20$${}=EF=BC=8C=E9=81=BF?= =?UTF-8?q?=E5=85=8D=E7=89=88=E6=9C=AC=E8=A2=AB=E9=A2=84=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=88=90=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cursor --- .drone.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index eb19e2f1..bc61b6df 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,6 +5,9 @@ # # docker.sock 与 /releases 由 runner 环境变量 DRONE_RUNNER_VOLUMES 注入, # 勿在本文件再声明同路径 host volume,否则会 Duplicate mount point。 +# +# 注意:Drone 会对 commands 里的 ${VAR} 做预处理替换;自定义环境变量请用 $${VAR} +# 或直接写死版本号,避免变成空字符串。 kind: pipeline type: docker @@ -29,12 +32,13 @@ steps: NPM_REGISTRY: https://registry.npmmirror.com PIP_INDEX_URL: https://mirrors.aliyun.com/pypi/simple/ PIP_TRUSTED_HOST: mirrors.aliyun.com - # 固定交付版本(勿改为 DRONE_TAG,生产 .env 使用 v1.1.0) ZKXW_DEPLOY_VERSION: v1.1.0 commands: - set -eu - apk add --no-cache bash git python3 - - echo "==> git tag=${DRONE_TAG:-none} deploy_version=${ZKXW_DEPLOY_VERSION} commit=${DRONE_COMMIT}" + # 固定 v1.1.0;$${ } 防止 Drone 预处理把自定义变量掏空 + - export ZKXW_DEPLOY_VERSION="$${ZKXW_DEPLOY_VERSION:-v1.1.0}" + - echo "==> git tag=${DRONE_TAG:-none} deploy_version=$${ZKXW_DEPLOY_VERSION} commit=${DRONE_COMMIT}" - chmod +x scripts/package-docker-deploy.sh scripts/build-docker-images.sh - | if [ -f /releases/.deploy-docker.env ]; then @@ -42,8 +46,8 @@ steps: cp /releases/.deploy-docker.env deploy/docker/.env echo "using /releases/.deploy-docker.env for secret inject" fi - - ./scripts/package-docker-deploy.sh "${ZKXW_DEPLOY_VERSION}" + - ./scripts/package-docker-deploy.sh "$${ZKXW_DEPLOY_VERSION}" - mkdir -p /releases - - cp -v dist/zkxw-docker-deploy-"${ZKXW_DEPLOY_VERSION}".tar.gz /releases/ - - ls -lh /releases/zkxw-docker-deploy-"${ZKXW_DEPLOY_VERSION}".tar.gz - - sha256sum /releases/zkxw-docker-deploy-"${ZKXW_DEPLOY_VERSION}".tar.gz + - cp -v dist/zkxw-docker-deploy-"$${ZKXW_DEPLOY_VERSION}".tar.gz /releases/ + - ls -lh /releases/zkxw-docker-deploy-"$${ZKXW_DEPLOY_VERSION}".tar.gz + - sha256sum /releases/zkxw-docker-deploy-"$${ZKXW_DEPLOY_VERSION}".tar.gz