From 46a95871603f4f246bdd8386bb08e9054f2f1e68 Mon Sep 17 00:00:00 2001
From: chenxing <chenxing@bestsch.com>
Date: Wed, 9 Sep 2026 20:47:11 +0800
Subject: [PATCH] =?UTF-8?q?ci:=20build.yml=20maven=20=E5=AE=B9=E5=99=A8?=
 =?UTF-8?q?=E5=90=8D=E5=94=AF=E4=B8=80=E5=8C=96=EF=BC=88-=20=E6=8C=89=20SH?=
 =?UTF-8?q?A=20=E5=89=8D=E7=BC=80=EF=BC=89=EF=BC=8C=E6=B6=88=E9=99=A4?=
 =?UTF-8?q?=E5=90=8C=20runner=20=E8=B7=A8=E4=BB=93=E5=BA=93=20mavenbuild?=
 =?UTF-8?q?=20=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/build.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 4b2df00..819baf4 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -38,6 +38,7 @@ jobs:
           # 取提交备注首行，脱去换行/双引号/反斜杠（避免破坏 webhook JSON），截断到 200 字符
           COMMIT_MSG=$(git log -1 --pretty=%s | tr '\n' ' ' | sed 's/["\\]/ /g' | cut -c1-200)
           echo "COMMIT_MSG=${COMMIT_MSG}" >> "$GITHUB_ENV"
+          echo "MB=$(echo ${GITHUB_SHA} | cut -c1-6)" >> "$GITHUB_ENV"
 
       # 可选：清空 m2 缓存（仅手动勾选 cache_bust 时）
       - name: 可选清空 m2 缓存
@@ -55,18 +56,18 @@ jobs:
       - name: 构建 jar（maven 容器，复用宿主 m2 缓存）
         run: |
           set -e
-          docker rm -f mavenbuild 2>/dev/null || true
-          docker run -d --name mavenbuild \
+          docker rm -f mavenbuild-${MB} 2>/dev/null || true
+          docker run -d --name mavenbuild-${MB} \
             --network infra-infra-net \
             -v /opt/docker/projman-m2:/root/.m2 \
             -w /build maven:3.6.3-jdk-8 sleep 3600
-          docker cp "${PWD}/." mavenbuild:/build/
-          docker exec mavenbuild sh -c "printf '%s' '<settings><profiles><profile><id>nexus-repo</id><repositories><repository><id>nexus-internal</id><url>http://nexus:8081/repository/maven-public/</url><releases><enabled>true</enabled></releases><snapshots><enabled>true</enabled><updatePolicy>always</updatePolicy></snapshots></repository></repositories></profile></profiles><activeProfiles><activeProfile>nexus-repo</activeProfile></activeProfiles></settings>' > /root/.m2/settings.xml"
-          docker exec mavenbuild sh -c 'cd /build && mvn -B -DskipTests clean package'
-          docker exec mavenbuild sh -c 'cd /build/target && cp *.jar app.jar'
+          docker cp "${PWD}/." mavenbuild-${MB}:/build/
+          docker exec mavenbuild-${MB} sh -c "printf '%s' '<settings><profiles><profile><id>nexus-repo</id><repositories><repository><id>nexus-internal</id><url>http://nexus:8081/repository/maven-public/</url><releases><enabled>true</enabled></releases><snapshots><enabled>true</enabled><updatePolicy>always</updatePolicy></snapshots></repository></repositories></profile></profiles><activeProfiles><activeProfile>nexus-repo</activeProfile></activeProfiles></settings>' > /root/.m2/settings.xml"
+          docker exec mavenbuild-${MB} sh -c 'cd /build && mvn -B -DskipTests clean package'
+          docker exec mavenbuild-${MB} sh -c 'cd /build/target && cp *.jar app.jar'
           mkdir -p "${PWD}/target"
-          docker cp mavenbuild:/build/target/app.jar "${PWD}/target/app.jar"
-          docker rm -f mavenbuild
+          docker cp mavenbuild-${MB}:/build/target/app.jar "${PWD}/target/app.jar"
+          docker rm -f mavenbuild-${MB}
 
       - name: 构建并推送镜像
         run: |