From bb3c438b58a452b3c74722367e89577fc34b299a Mon Sep 17 00:00:00 2001
From: KaGaMi <kagamilin10271@gmail.com>
Date: Sat, 12 Jul 2025 22:34:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=95=9C=E5=83=8F=E6=89=93?=
 =?UTF-8?q?=E5=8C=8519?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/test.yml | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 26af53f..fa0a07b 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -54,12 +54,10 @@ jobs:
         run: |
           echo "🐳 构造Node.js Hello World应用镜像..."
 
-          # echo "📦 镜像名称: $REPOSITORY"
-
           # 构造镜像
           BUILD_IMAGE_CMD="docker build -t $REPOSITORY:latest ."
-          echo "📦 构造Docker镜像命令: $BUILD_IMAGE_CMD"
-          eval $BUILD_IMAGE_CMD
+          echo "📦 构造Docker镜像命令: $BUILD_IMAGE_CMD" && eval $BUILD_IMAGE_CMD
+          
           echo "✅ Docker镜像构造完成！" # 可以将此信息改为更通用
 
       - name: 推送Docker镜像
@@ -70,25 +68,21 @@ jobs:
           IMAGE_PATH="$REGISTRY_HOST/$REPOSITORY"
           echo "🔍 远程镜像路径: $IMAGE_PATH"
 
-          #打标签
-          TAG_IMAGE_CMD="docker tag $REPOSITORY $IMAGE_PATH:latest"
-          echo "🏷️ 打标签命令: $TAG_IMAGE_CMD"
-          eval $TAG_IMAGE_CMD
-
-          #推送镜像
-          echo "🔍 推送镜像 :docker push $IMAGE_PATH:latest"
-          PUSH_IMAGE_CMD="docker push $IMAGE_PATH:latest"
-          eval $PUSH_IMAGE_CMD
-
           #打SHA标签
           TAG_IMAGE_CMD="docker tag $REPOSITORY $IMAGE_PATH:${{ gitea.sha }}"
-          echo "🏷️ 打标签命令: $TAG_IMAGE_CMD"
-          eval $TAG_IMAGE_CMD
-
+          echo "🏷️ 打标签命令: $TAG_IMAGE_CMD" && eval $TAG_IMAGE_CMD
+          
           #推送SHA标签
-          echo "🔍 推送SHA标签:docker push $IMAGE_PATH:${{ gitea.sha }}"
           PUSH_IMAGE_CMD="docker push $IMAGE_PATH:${{ gitea.sha }}"
-          eval $PUSH_IMAGE_CMD
+          echo "🔍 推送SHA标签:$PUSH_IMAGE_CMD" &&  eval $PUSH_IMAGE_CMD
+
+          #打标签
+          TAG_IMAGE_CMD="docker tag $REPOSITORY $IMAGE_PATH:latest"
+          echo "🏷️ 打标签命令: $TAG_IMAGE_CMD" && eval $TAG_IMAGE_CMD
+
+          #推送镜像
+          PUSH_IMAGE_CMD="docker push $IMAGE_PATH:latest"
+          echo "🔍 推送镜像 :$PUSH_IMAGE_CMD" && eval $PUSH_IMAGE_CMD
 
           echo "✅ Docker镜像推送完成！"