From 5e1a0e0585ada2cf25d74506efd5a080f53d14a0 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 20 Jul 2026 19:57:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ci:=20code-review=20checkout=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=87=8D=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/code-review.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitea/workflows/code-review.yml b/.gitea/workflows/code-review.yml index 07daa8bd5..b961b9971 100644 --- a/.gitea/workflows/code-review.yml +++ b/.gitea/workflows/code-review.yml @@ -25,6 +25,10 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 + # 网络波动自动重试2次 + retry: + max_attempts: 2 + retry_on: error - name: Install dependencies run: | @@ -64,3 +68,4 @@ jobs: START_TIME="" [ -f /tmp/ci_job_start_time ] && START_TIME=$(cat /tmp/ci_job_start_time) python3 scripts/ci/ci_trace_report.py --service xiaoxia-saas-ci --status $STATUS --start-time "$START_TIME" || true + -- 2.54.0 From 56cc0844da6c11ce73ea1d392579c0b31015018b Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 20 Jul 2026 19:57:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?ci:=20ci-trigger-monitor=20checkout?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=87=8D=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/ci-trigger-monitor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitea/workflows/ci-trigger-monitor.yml b/.gitea/workflows/ci-trigger-monitor.yml index eac6df81d..4a0292353 100644 --- a/.gitea/workflows/ci-trigger-monitor.yml +++ b/.gitea/workflows/ci-trigger-monitor.yml @@ -21,6 +21,10 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 + # 网络波动自动重试2次 + retry: + max_attempts: 2 + retry_on: error - name: Check CI trigger status for all open PRs env: -- 2.54.0 From 76ff7976427758548e3f6b9732d2711489e98495 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 20 Jul 2026 19:57:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?ci:=20Docker=20login=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=87=8D=E8=AF=95=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/ci-pipeline.yml | 39 ++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/ci-pipeline.yml b/.gitea/workflows/ci-pipeline.yml index c834c285a..f0ef7186c 100755 --- a/.gitea/workflows/ci-pipeline.yml +++ b/.gitea/workflows/ci-pipeline.yml @@ -465,9 +465,16 @@ jobs: GITEA_REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }} run: | set -eu - printf '%s' "${ACR_PASSWORD}" | docker login xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin - docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}" - echo "Docker login successful" + # Docker login 带重试(网络波动时自动重试) + for i in 1 2 3; do + echo "=== Docker login 尝试 $i/3 ===" + if printf '%s' "${ACR_PASSWORD}" | docker login xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin && docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}"; then + echo "✅ Docker login successful" + break + fi + echo "❌ Docker login 失败(尝试 $i/3),5s 后重试..." + sleep 5 + done - name: Setup cache strategy shell: sh run: | @@ -589,9 +596,16 @@ jobs: GITEA_REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }} run: | set -eu - printf '%s' "${ACR_PASSWORD}" | docker login xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin - docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}" - echo "Docker login successful" + # Docker login 带重试(网络波动时自动重试) + for i in 1 2 3; do + echo "=== Docker login 尝试 $i/3 ===" + if printf '%s' "${ACR_PASSWORD}" | docker login xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin && docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}"; then + echo "✅ Docker login successful" + break + fi + echo "❌ Docker login 失败(尝试 $i/3),5s 后重试..." + sleep 5 + done - name: Install SSH client if: success() shell: sh @@ -858,9 +872,16 @@ jobs: GITEA_REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }} run: | set -eu - printf '%s' "${ACR_PASSWORD}" | docker login xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin - docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}" - echo "Docker login successful" + # Docker login 带重试(网络波动时自动重试) + for i in 1 2 3; do + echo "=== Docker login 尝试 $i/3 ===" + if printf '%s' "${ACR_PASSWORD}" | docker login xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin && docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}"; then + echo "✅ Docker login successful" + break + fi + echo "❌ Docker login 失败(尝试 $i/3),5s 后重试..." + sleep 5 + done - name: Setup cache strategy shell: sh run: | -- 2.54.0