diff --git a/.gitea/workflows/deploy-client.yml b/.gitea/workflows/deploy-client.yml index d9319f8..fc76eca 100644 --- a/.gitea/workflows/deploy-client.yml +++ b/.gitea/workflows/deploy-client.yml @@ -39,9 +39,10 @@ jobs: GOPROXY: https://goproxy.cn,direct PUB_HOSTED_URL: https://pub.flutter-io.cn FLUTTER_STORAGE_BASE_URL: https://storage.flutter-io.cn - # sing-box 源码经 NAS gitea 镜像取(mac runner 连不上 github;经 runner 的 - # gitea relay 127.0.0.1:13000 → wangjia/sing-box)。见 scripts/build-libbox.sh。 - SINGBOX_GIT: http://127.0.0.1:13000/wangjia/sing-box.git + # sing-box 源码经 NAS gitea 公网镜像取(mac runner 连不上 github)。 + # 用稳定公网域名 git.51yanmei.com(ali frps ← 家里 NAS frpc,nginx 443 反代 + # gitea)—— 外网/内网都通,不依赖本地 relay/tailscale。见 scripts/build-libbox.sh。 + SINGBOX_GIT: https://git.51yanmei.com/wangjia/sing-box.git steps: - name: Checkout uses: actions/checkout@v4 @@ -112,8 +113,11 @@ jobs: runs-on: mac continue-on-error: true env: + GOPROXY: https://goproxy.cn,direct PUB_HOSTED_URL: https://pub.flutter-io.cn FLUTTER_STORAGE_BASE_URL: https://storage.flutter-io.cn + # macOS 同样内嵌 libbox → 同走 NAS gitea 公网镜像取 sing-box 源码(见 build-android)。 + SINGBOX_GIT: https://git.51yanmei.com/wangjia/sing-box.git steps: - name: Checkout uses: actions/checkout@v4 @@ -143,8 +147,11 @@ jobs: runs-on: mac continue-on-error: true env: + GOPROXY: https://goproxy.cn,direct PUB_HOSTED_URL: https://pub.flutter-io.cn FLUTTER_STORAGE_BASE_URL: https://storage.flutter-io.cn + # iOS 同样内嵌 libbox → 同走 NAS gitea 公网镜像取 sing-box 源码(见 build-android)。 + SINGBOX_GIT: https://git.51yanmei.com/wangjia/sing-box.git steps: - name: Checkout uses: actions/checkout@v4 diff --git a/client/android/build.gradle b/client/android/build.gradle index d2ffbff..8f2e274 100644 --- a/client/android/build.gradle +++ b/client/android/build.gradle @@ -1,5 +1,8 @@ allprojects { repositories { + // 国内镜像优先(见 settings.gradle 同注);原仓库保留作 fallback。 + maven { url "https://maven.aliyun.com/repository/google" } + maven { url "https://maven.aliyun.com/repository/public" } google() mavenCentral() } diff --git a/client/android/gradle/wrapper/gradle-wrapper.properties b/client/android/gradle/wrapper/gradle-wrapper.properties index 4518132..72153b1 100644 --- a/client/android/gradle/wrapper/gradle-wrapper.properties +++ b/client/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +# 国内镜像:services.gradle.org 被 GFW 墙(SSL 重置),CI runner 在墙内下载发行版会失败。 +# 腾讯云 gradle 镜像提供同一份 zip。见 client/android/{settings,build}.gradle 的 maven 镜像同理。 +distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.7-bin.zip diff --git a/client/android/settings.gradle b/client/android/settings.gradle index 60dcd4a..e5263dc 100644 --- a/client/android/settings.gradle +++ b/client/android/settings.gradle @@ -10,6 +10,11 @@ pluginManagement { includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") repositories { + // 国内镜像优先(CI runner 在墙内,直连 google/central/gradlePluginPortal 会被 GFW 重置); + // 原仓库保留作 fallback。与 deploy-client.yml 的 GOPROXY/PUB 镜像同理。 + maven { url "https://maven.aliyun.com/repository/google" } + maven { url "https://maven.aliyun.com/repository/public" } + maven { url "https://maven.aliyun.com/repository/gradle-plugin" } google() mavenCentral() gradlePluginPortal()