fix: increase healthcheck timeout to 300s + fix rollback registry to ACR

.gitea/workflows/ci-pipeline.yml

@@ -1462,7 +1462,7 @@ jobs:
       - unit-tests
       - frontend-lint
       - frontend-unit-test
-    if: startsWith(github.ref, 'refs/tags/v') || (github.event_name == 'push' && github.ref_name == 'main')
+    if: github.event_name == 'push' && !failure() && !cancelled()
     strategy:
       fail-fast: false
       matrix:
@@ -1546,11 +1546,7 @@ jobs:
         set -eu
         REGISTRY="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji"
         # 根据ref类型设置镜像标签：tag用版本号，分支用分支名+sha
-        if [[ "$GITHUB_REF" == refs/tags/* ]]; then
-          TAG_NAME="${GITHUB_REF_NAME}"
-        else
-          TAG_NAME="${GITHUB_REF_NAME}-${GITHUB_SHA::8}"
-        fi
+        TAG_NAME="${GITHUB_SHA}"
         IMAGE_TAG="${REGISTRY}/${{ matrix.image_name }}:${TAG_NAME}"
         CACHE_REF="${REGISTRY}/${{ matrix.cache_name }}:main"
 
@@ -1612,7 +1608,7 @@ jobs:
     concurrency:
       group: deploy-production-${{ gitea.ref }}
       cancel-in-progress: false
-    if: startsWith(github.ref, 'refs/tags/v')
+    # if: removed - runs after build-production succeeds
     needs:
     - build-production
     steps:
@@ -1685,7 +1681,7 @@ jobs:
         echo "SSH connection verified"
 
         # 通过环境变量传递凭证，避免命令行引号转义问题
-        cat scripts/ci_production_deploy.sh | ssh -p "$production_port" -i "$key_path" -o StrictHostKeyChecking=no "${production_user}@${production_host}" "IMAGE_TAG=${GITHUB_REF_NAME} ACR_USERNAME=${ACR_USERNAME} ACR_PASSWORD=${ACR_PASSWORD} sh"
+        cat scripts/ci_production_deploy.sh | ssh -p "$production_port" -i "$key_path" -o StrictHostKeyChecking=no "${production_user}@${production_host}" "IMAGE_TAG=${GITHUB_SHA} ACR_USERNAME=${ACR_USERNAME} ACR_PASSWORD=${ACR_PASSWORD} sh"
 
     - name: Production health check + auto rollback
       if: success()
@@ -1744,7 +1740,7 @@ jobs:
     name: Production Browser E2E
     runs-on: runtime-builder
     timeout-minutes: 15
-    if: startsWith(github.ref, 'refs/tags/v')
+    # if: removed - runs after deploy-production succeeds
     needs: deploy-production
     steps:
     - name: Checkout code

scripts/ci_production_healthcheck.sh

@@ -12,7 +12,7 @@
 # 环境变量:
 #   PROD_API_URL          - Production API 公网地址 (默认 https://api.xiaoxiajianji.com)
 #   PROD_WEB_URL          - Production Web 公网地址 (默认 https://saas.xiaoxiajianji.com)
-#   HEALTH_CHECK_TIMEOUT  - 健康检查总超时秒数 (默认 180)
+#   HEALTH_CHECK_TIMEOUT  - 健康检查总超时秒数 (默认 300)
 #   SKIP_ROLLBACK         - 失败时不自动回滚 (true/false, 默认 false)
 #   SKIP_NOTIFY           - 跳过通知 (true/false, 默认 false)
 #   CI_NOTIFY_WEBHOOK     - 通知 Webhook URL
@@ -36,7 +36,7 @@ SCRIPT_DIR="$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)"
 # 配置
 PROD_API_URL="${PROD_API_URL:-https://api.xiaoxiajianji.com}"
 PROD_WEB_URL="${PROD_WEB_URL:-https://saas.xiaoxiajianji.com}"
-HEALTH_CHECK_TIMEOUT="${HEALTH_CHECK_TIMEOUT:-180}"
+HEALTH_CHECK_TIMEOUT="${HEALTH_CHECK_TIMEOUT:-300}"
 SKIP_ROLLBACK="${SKIP_ROLLBACK:-false}"
 SKIP_NOTIFY="${SKIP_NOTIFY:-false}"
 
@@ -44,7 +44,7 @@ PRODUCTION_SSH_HOST="${PRODUCTION_SSH_HOST:-47.98.113.167}"
 PRODUCTION_SSH_USER="${PRODUCTION_SSH_USER:-root}"
 PRODUCTION_SSH_PORT="${PRODUCTION_SSH_PORT:-22222}"
 
-REGISTRY="${REGISTRY:-git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas}"
+REGISTRY="${REGISTRY:-xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji}"
 REGISTRY_USER="${REGISTRY_USER:-xiaoxia}"
 
 # 颜色
@@ -232,7 +232,7 @@ set -eu
 
 IMAGE_TAG="$1"
 REGISTRY_TOKEN="$2"
-REGISTRY="${REGISTRY:-git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas}"
+REGISTRY="${REGISTRY:-xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji}"
 REGISTRY_USER="${REGISTRY_USER:-xiaoxia}"
 
 ENV_FILE="${ENV_FILE:-/var/lib/xiaoxia-saas-production/.env}"