From fad12efd7294c15571649e8f83b58c02b246018f Mon Sep 17 00:00:00 2001 From: CI Bot Date: Sun, 19 Jul 2026 20:38:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(ci):=20=E4=BF=AE=E5=A4=8Ddeploy?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=A4=9A=E4=BD=99=E5=8F=8C=E5=BC=95=E5=8F=B7?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E8=AF=AD=E6=B3=95=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #611 合入时引入的笔误，echo行末尾多了一个双引号，导致 SSH远端用sh执行时脚本报 Syntax error: "(" unexpected， Deploy Staging步骤失败，staging无法自动更新。 修复：移除多余的双引号，staging和production两个脚本都修。 --- scripts/ci_production_deploy.sh | 2 +- scripts/ci_staging_deploy.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci_production_deploy.sh b/scripts/ci_production_deploy.sh index dec3e9032..b41c2143e 100644 --- a/scripts/ci_production_deploy.sh +++ b/scripts/ci_production_deploy.sh @@ -250,7 +250,7 @@ retry_docker_pull "$REGISTRY_API" retry_docker_pull "$REGISTRY_WORKER" retry_docker_pull "$REGISTRY_WEB" -echo "All images pulled."" +echo "All images pulled." # ---- 备份 legacy assets ---- echo "Backing up legacy assets from current web container..." diff --git a/scripts/ci_staging_deploy.sh b/scripts/ci_staging_deploy.sh index f91613257..abe59864a 100755 --- a/scripts/ci_staging_deploy.sh +++ b/scripts/ci_staging_deploy.sh @@ -244,7 +244,7 @@ retry_docker_pull "$REGISTRY_API" retry_docker_pull "$REGISTRY_WORKER" retry_docker_pull "$REGISTRY_WEB" -echo "All images pulled."" +echo "All images pulled." # ---- 备份 legacy assets ---- echo "Backing up legacy assets from current web container..." -- 2.54.0 From f7c59b6b443220deacb79a25ca5ae645bed23b7a Mon Sep 17 00:00:00 2001 From: CI Bot Date: Sun, 19 Jul 2026 20:39:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(ci):=20=E4=BF=AE=E5=A4=8DACR=20cleanup?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E5=91=BD=E4=BB=A4=E8=A1=8C=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit acr_cleanup.py通过环境变量(ACR_REGISTRY/ACR_NAMESPACE/ACR_USERNAME/ACR_PASSWORD) 读取配置，不接受--registry/--namespace/--username/--password参数。 CI重构时错误地把这些当作命令行参数传入，导致job失败。 移除错误参数，保留正确的--keep/--pr-days/--execute参数。 --- .gitea/workflows/ci-pipeline.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitea/workflows/ci-pipeline.yml b/.gitea/workflows/ci-pipeline.yml index b32bc8c3e..6d20a27c7 100755 --- a/.gitea/workflows/ci-pipeline.yml +++ b/.gitea/workflows/ci-pipeline.yml @@ -931,10 +931,6 @@ jobs: run: | set -eu python3 scripts/ci/acr_cleanup.py \ - --registry "$ACR_REGISTRY" \ - --namespace "$ACR_NAMESPACE" \ - --username "$ACR_USERNAME" \ - --password "$ACR_PASSWORD" \ --keep 20 \ --pr-days 7 \ --execute -- 2.54.0