From 695ba1530e012d4f3f15cb8a5832ec226682dad0 Mon Sep 17 00:00:00 2001 From: ops Date: Wed, 21 Oct 2026 06:24:25 +0000 Subject: [PATCH] =?UTF-8?q?fix(ci):=20=E6=9E=84=E5=BB=BA=E5=AE=B9=E5=99=A8?= =?UTF-8?q?=E5=90=8D=E5=94=AF=E4=B8=80=E5=8C=96=20+=20npm=20=E8=B5=B0?= =?UTF-8?q?=E5=9B=BD=E5=86=85=E9=95=9C=E5=83=8F=E6=BA=90=EF=BC=88=E9=81=BF?= =?UTF-8?q?=E5=85=8D=E5=B9=B6=E5=8F=91=E4=BA=92=E8=B8=A9=20exit=20137?= =?UTF-8?q?=EF=BC=89?= 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 fa36939..0108cec 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -56,14 +56,20 @@ jobs: - name: 构建 publish 产物(dotnet sdk 容器,复用宿主 nuget 缓存) run: | set -e - docker rm -f dotnetbuild 2>/dev/null || true - docker run -d --name dotnetbuild \ + # 构建容器名必须全局唯一:runner 挂的是宿主 docker.sock,容器名在整个 daemon 上共享 + # 命名空间。固定名会在多仓/多条 workflow 并发时互相 docker rm -f 掉对方正在构建的 + # 容器,表现为无编译报错的 exit 137(SIGKILL,2026-10-21 实测复现)。 + # GITHUB_RUN_ID 实例级唯一,再拼时间戳兜底。 + BUILD_CONTAINER="dotnetbuild-${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" \ --network infra-infra-net \ -v /opt/docker/projman-dotnet-nuget:/root/.nuget/packages \ -w /build mcr.microsoft.com/dotnet/sdk:5.0 sleep 3600 - docker cp "${PWD}/." dotnetbuild:/build/ - docker exec dotnetbuild sh -c "find /build -maxdepth 2 -iname nuget.config -exec sed -i 's|//nexus.yunhaixingtong.com|//nexus:8081|g' {} +" - docker exec dotnetbuild sh -c ' + docker cp "${PWD}/." "$BUILD_CONTAINER":/build/ + docker exec "$BUILD_CONTAINER" sh -c "find /build -maxdepth 2 -iname nuget.config -exec sed -i 's|//nexus.yunhaixingtong.com|//nexus:8081|g' {} +" + docker exec "$BUILD_CONTAINER" sh -c ' set -e root_sln=$(ls /build/*.sln 2>/dev/null | head -1 || true) root_csproj=$(ls /build/*.csproj 2>/dev/null | head -1 || true) @@ -91,8 +97,8 @@ jobs: echo "publish target: $target" ' mkdir -p "${PWD}/publish" - docker cp dotnetbuild:/app/. "${PWD}/publish/" - docker rm -f dotnetbuild + docker cp "$BUILD_CONTAINER":/app/. "${PWD}/publish/" + docker rm -f "$BUILD_CONTAINER" # 入口脚本:runtimeconfig.json 是可执行项目唯一标志(X.runtimeconfig.json <-> X.dll), # 类库 deps.json 无 runtimeconfig 兄弟文件,天然不会误选 entry=$(ls "${PWD}"/publish/*.runtimeconfig.json | head -1)