From 7c925cd4f25a68af79933b24e268ec106ee859d8 Mon Sep 17 00:00:00 2001 From: chenxing Date: Thu, 10 Sep 2026 12:17:01 +0800 Subject: [PATCH] =?UTF-8?q?ci=E4=BF=AE=E8=AE=A2=EF=BC=9A=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=AE=B9=E5=99=A8=E5=90=8D=E5=94=AF=E4=B8=80=E5=8C=96=EF=BC=88?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8E=E5=90=8C=E5=AE=BF=E4=B8=BB=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E4=BB=93=E5=B9=B6=E5=8F=91=E6=9E=84=E5=BB=BA=E6=97=B6?= =?UTF-8?q?=20exit=20137=20=E4=BA=92=E6=9D=80=EF=BC=89-runner=20=E6=8C=82?= =?UTF-8?q?=E5=AE=BF=E4=B8=BB=20docker.sock=EF=BC=8C=E5=AE=B9=E5=99=A8?= =?UTF-8?q?=E5=90=8D=E5=9C=A8=E6=95=B4=E4=B8=AA=20daemon=20=E4=B8=8A?= =?UTF-8?q?=E5=85=B1=E4=BA=AB=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4=EF=BC=8C?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=90=8D=20frontbuild=20=E5=9C=A8=E5=A4=9A?= =?UTF-8?q?=E4=BB=93/=E5=A4=9A=20workflow=20=E5=B9=B6=E5=8F=91=E6=97=B6?= =?UTF-8?q?=E4=BC=9A=E8=A2=AB=E5=AF=B9=E6=96=B9=E7=9A=84=20docker=20rm=20-?= =?UTF-8?q?f=20=E7=9B=B4=E6=8E=A5=20SIGKILL=EF=BC=882026-09-10=20=E4=B8=89?= =?UTF-8?q?=E4=BB=93=E5=90=8C=E6=8E=A8=EF=BC=9A=E6=9C=AC=E4=BB=93=20build?= =?UTF-8?q?=20run#10=20=E4=B8=8E=20UserBase=20=E4=B8=A4=E6=9D=A1=20run=20?= =?UTF-8?q?=E8=A2=AB=E6=89=93=E6=AD=BB=E3=80=81Notice=20=E4=BE=A5=E5=B9=B8?= =?UTF-8?q?=E7=BB=BF=EF=BC=8C=E6=9C=AC=E4=BB=93=E6=94=B9=E5=8A=A8=E6=9C=AC?= =?UTF-8?q?=E8=BA=AB=20vitest=2099/99+build=20=E5=B7=B2=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=EF=BC=89=EF=BC=9B=E6=94=B9=E6=B3=95=20BUILD?= =?UTF-8?q?=5FCONTAINER=3Dfrontbuild-${GITHUB=5FRUN=5FID}-${=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=88=B3}=EF=BC=8Crun/exec/cp/rm=20=E5=85=A8=E6=AD=A5?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=BC=95=E7=94=A8=EF=BC=9BYAML=20=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E4=B8=8E=20step=20sh=20-n=20=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index c6156a1..d304a61 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -38,10 +38,16 @@ jobs: - name: 构建前端（node 容器） run: | set -e - docker rm -f frontbuild 2>/dev/null || true - docker run -d --name frontbuild -w /build node:20 sleep 3600 - docker cp "${PWD}/." frontbuild:/build/ - docker exec frontbuild sh -c ' + # 构建容器名必须全局唯一：runner 挂的是宿主 docker.sock，容器名在整个 daemon 上是共享 + # 命名空间。旧写法固定名 frontbuild 会在多仓/多条 workflow 并发时互相 docker rm -f 掉 + # 对方正在构建的容器，表现为无编译报错的 exit 137（SIGKILL，2026-09-10 三仓同推即撞）。 + # GITHUB_RUN_ID 实例级唯一，再拼时间戳兜底（手动重跑/未注入时也不撞名）。 + BUILD_CONTAINER="frontbuild-${GITHUB_RUN_ID:-0}-$(date +%s)" + echo "BUILD_CONTAINER=${BUILD_CONTAINER}" + docker rm -f "$BUILD_CONTAINER" 2>/dev/null || true + docker run -d --name "$BUILD_CONTAINER" -w /build node:20 sleep 3600 + docker cp "${PWD}/." "$BUILD_CONTAINER":/build/ + docker exec "$BUILD_CONTAINER" sh -c ' set -e cd /build if [ -f .npmrc ]; then sed -i "/SASS_BINARY_PATH/d" .npmrc; fi @@ -49,10 +55,10 @@ jobs: npm run build ' echo "=== dist 产物 ===" - docker exec frontbuild sh -c 'ls -la /build/dist/ | head -20' + docker exec "$BUILD_CONTAINER" sh -c 'ls -la /build/dist/ | head -20' # 从容器 cp dist 到宿主工作目录 - docker cp frontbuild:/build/dist ./dist - docker rm -f frontbuild + docker cp "$BUILD_CONTAINER":/build/dist ./dist + docker rm -f "$BUILD_CONTAINER" echo "BUILD CHECK OK" # 打包 dist → zip（vite outDir 已简化为直出 dist/，无中间层；进入 dist 打包，