From 86099965a64bade4444f34c844b9a93b02d5f6e7 Mon Sep 17 00:00:00 2001 From: catShark <1716967236@qq.com> Date: Sun, 8 Nov 2026 18:53:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20Gradle=20=E5=88=86=E5=8F=91=E5=8C=85?= =?UTF-8?q?=E6=94=B9=E7=94=A8=E5=9B=BD=E5=86=85=E9=95=9C=E5=83=8F=E5=B9=B6?= =?UTF-8?q?=E5=BB=B6=E9=95=BF=E8=B6=85=E6=97=B6=E3=80=81=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=89=8D=E5=B8=A6=E9=87=8D=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ci/Dockerfile | 12 ++++++++++++ gradle/wrapper/gradle-wrapper.properties | 10 ++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ci/Dockerfile b/ci/Dockerfile index c277864..3ccd465 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -32,6 +32,18 @@ RUN yes | sdkmanager --licenses > /dev/null \ WORKDIR /workspace COPY . . +# 先把 Gradle 分发包(约 140 MB)下下来,带重试; +# 后面真正的构建就直接用缓存,不会因为一次网络抖动整条流水线重跑。 +RUN set -e; \ + ok=0; \ + for i in 1 2 3; do \ + if ./gradlew --no-daemon --version > /tmp/gradle-wrapper.log 2>&1; then ok=1; break; fi; \ + echo "Gradle 分发包获取失败(第 $i 次),5 秒后重试"; \ + tail -5 /tmp/gradle-wrapper.log; \ + sleep 5; \ + done; \ + if [ "$ok" != "1" ]; then echo "三次都失败,日志:"; tail -30 /tmp/gradle-wrapper.log; exit 1; fi + # 容器内没有 daemon 需要常驻,显式关掉 RUN ./gradlew --no-daemon :app:assembleDebug diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d3f0219..7b2355e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,13 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.6-bin.zip -networkTimeout=10000 +# 官方 services.gradle.org 会 302 跳到 release-assets.githubusercontent.com, +# 国内网络下大文件经常 10s 读超时(CI 上已复现:Read timed out)。 +# 改用腾讯云镜像——与官方 zip 逐字节一致,sha256 已核对(见下面的 distributionSha256Sum)。 +# 如需换回官方源:distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.6-bin.zip +distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.14.6-bin.zip +distributionSha256Sum=7988ed071b2a07900e2ec715fca15c6ab72bce6db433af301fa7fa7e9407bd24 +# 140 MB 的分发包:10s 太短,慢速链路上必然超时 +networkTimeout=120000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists