ci: 完善构建流程和中国网络环境加速

android/app/build.gradle.kts

@@ -44,8 +44,6 @@ val oneKvmVersion = Regex("""(?m)^version\s*=\s*"([^"]+)"""")
     ?.groupValues
     ?.get(1)
     ?: throw GradleException("Failed to resolve version from root Cargo.toml")
-val androidFfmpegSourceDir = rootProject.layout.projectDirectory
-    .dir("../.tmp/android-ffmpeg-check/src/ffmpeg-rockchip")
 val localProperties = Properties().apply {
     val file = rootProject.file("local.properties")
     if (file.exists()) {
@@ -207,16 +205,13 @@ tasks.register<Exec>("buildAndroidFfmpegMediaCodec") {
     group = "build"
 
     val ffmpegRoot = file(androidFfmpegRoot.get())
-    val sourceDir = androidFfmpegSourceDir.asFile
     val scriptFile = androidFfmpegBuildScript.asFile
     val stampFile = ffmpegRoot.resolve(".one-kvm-android-ffmpeg.stamp")
 
     workingDir = rootProject.layout.projectDirectory.dir("..").asFile
     commandLine(
         "bash",
         scriptFile.absolutePath,
-        "--source",
-        sourceDir.absolutePath,
         "--output",
         ffmpegRoot.absolutePath,
         "--ndk",
@@ -227,20 +222,13 @@ tasks.register<Exec>("buildAndroidFfmpegMediaCodec") {
         selectedAndroidAbis.joinToString(","),
     )
 
-    inputs.dir(sourceDir)
     inputs.file(scriptFile)
     outputs.dir(ffmpegRoot)
 
     onlyIf {
         val hasAndroidFfmpeg = androidFfmpegRequiredFiles(ffmpegRoot).all { it.exists() }
         val hasCurrentBuildStamp =
             stampFile.exists() && stampFile.readText() == androidFfmpegBuildStamp(scriptFile)
-        if (!hasAndroidFfmpeg && !sourceDir.resolve("configure").exists()) {
-            throw GradleException(
-                "Missing Android FFmpeg MediaCodec build at ${ffmpegRoot.absolutePath}, " +
-                    "and source was not found at ${sourceDir.absolutePath}",
-            )
-        }
         !hasAndroidFfmpeg || !hasCurrentBuildStamp
     }
 

android/settings.gradle.kts

@@ -1,14 +1,35 @@
 pluginManagement {
+    fun isEnabled(value: String?): Boolean = when (value?.lowercase()) {
+        "1", "true", "yes", "on" -> true
+        else -> false
+    }
+    val mirrorAcceleration = isEnabled(System.getenv("CHINAMIRRO"))
+
     repositories {
+        if (mirrorAcceleration) {
+            maven("https://maven.aliyun.com/repository/google")
+            maven("https://maven.aliyun.com/repository/public")
+            maven("https://maven.aliyun.com/repository/gradle-plugin")
+        }
         google()
         mavenCentral()
         gradlePluginPortal()
     }
 }
 
 dependencyResolutionManagement {
+    fun isEnabled(value: String?): Boolean = when (value?.lowercase()) {
+        "1", "true", "yes", "on" -> true
+        else -> false
+    }
+    val mirrorAcceleration = isEnabled(System.getenv("CHINAMIRRO"))
+
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
+        if (mirrorAcceleration) {
+            maven("https://maven.aliyun.com/repository/google")
+            maven("https://maven.aliyun.com/repository/public")
+        }
         google()
         mavenCentral()
     }

build/build-android.sh

@@ -17,28 +17,21 @@ fail() {
 build_android() {
     local arch="$1"
     local docker_build_args=()
-    local docker_mount_args=()
     local gradle_distribution_url="${ONE_KVM_GRADLE_DISTRIBUTION_URL:-}"
     local gradle_distribution_url_cn="${ONE_KVM_GRADLE_DISTRIBUTION_URL_CN:-https://mirrors.cloud.tencent.com/gradle/gradle-9.1.0-bin.zip}"
     local gradle_network_timeout="${ONE_KVM_GRADLE_NETWORK_TIMEOUT:-120000}"
-    local gradle_cache="${ONE_KVM_ANDROID_GRADLE_CACHE_DIR:-one-kvm-android-gradle-cache}"
-    local cargo_registry_cache="${ONE_KVM_ANDROID_CARGO_REGISTRY_CACHE_DIR:-one-kvm-android-cargo-registry}"
-    local cargo_git_cache="${ONE_KVM_ANDROID_CARGO_GIT_CACHE_DIR:-one-kvm-android-cargo-git}"
-
-    add_cache_mount() {
-        local source="$1"
-        local target="$2"
-
-        if [[ "$source" == /* || "$source" == ./* || "$source" == ../* ]]; then
-            mkdir -p "$source"
-            source="$(cd "$source" && pwd)"
-        fi
-
-        docker_mount_args+=("-v" "$source:$target")
-    }
 
     if [[ "${CHINAMIRRO:-}" == "1" ]]; then
         docker_build_args+=("--build-arg" "CHINAMIRRO=1")
+        docker_build_args+=("--build-arg" "DEBIAN_IMAGE=${DEBIAN_IMAGE:-docker.1ms.run/library/debian:11}")
+        docker_build_args+=("--build-arg" "RUSTUP_DIST_SERVER_CN=${RUSTUP_DIST_SERVER_CN:-https://rsproxy.cn}")
+        docker_build_args+=("--build-arg" "RUSTUP_UPDATE_ROOT_CN=${RUSTUP_UPDATE_ROOT_CN:-https://rsproxy.cn/rustup}")
+        docker_build_args+=("--build-arg" "CARGO_INDEX_CN=${CARGO_INDEX_CN:-https://rsproxy.cn/crates.io-index}")
+        docker_build_args+=("--build-arg" "CARGO_REGISTRY_CN=${CARGO_REGISTRY_CN:-sparse+https://rsproxy.cn/index/}")
+        docker_build_args+=("--build-arg" "MAVEN_REPOSITORY_CN=${MAVEN_REPOSITORY_CN:-https://maven.aliyun.com/repository/public}")
+        docker_build_args+=("--build-arg" "GOOGLE_MAVEN_REPOSITORY_CN=${GOOGLE_MAVEN_REPOSITORY_CN:-https://maven.aliyun.com/repository/google}")
+        docker_build_args+=("--build-arg" "GRADLE_PLUGIN_REPOSITORY_CN=${GRADLE_PLUGIN_REPOSITORY_CN:-https://maven.aliyun.com/repository/gradle-plugin}")
+        docker_build_args+=("--build-arg" "GRADLE_DISTRIBUTION_URL_CN=$gradle_distribution_url_cn")
         if [[ -z "$gradle_distribution_url" ]]; then
             gradle_distribution_url="$gradle_distribution_url_cn"
         fi
@@ -55,16 +48,12 @@ build_android() {
             "$PROJECT_ROOT/build/cross"
     fi
 
-    add_cache_mount "$gradle_cache" "/root/.gradle"
-    add_cache_mount "$cargo_registry_cache" "/root/.cargo/registry"
-    add_cache_mount "$cargo_git_cache" "/root/.cargo/git"
-
     echo "=== Building Android APK: $arch ==="
     docker run --rm \
         -v "$PROJECT_ROOT:/workspace" \
-        "${docker_mount_args[@]}" \
         -w /workspace \
         -e "CHINAMIRRO=${CHINAMIRRO:-0}" \
+        -e "GH_PROXY=${GH_PROXY:-https://gh-proxy.com}" \
         -e "ONE_KVM_GRADLE_DISTRIBUTION_URL=$gradle_distribution_url" \
         -e "ONE_KVM_GRADLE_DISTRIBUTION_URL_CN=$gradle_distribution_url_cn" \
         -e "ONE_KVM_GRADLE_NETWORK_TIMEOUT=$gradle_network_timeout" \
@@ -102,9 +91,6 @@ Examples:
   CHINAMIRRO=1 ONE_KVM_GRADLE_DISTRIBUTION_URL=https://mirrors.aliyun.com/macports/distfiles/gradle/gradle-9.1.0-bin.zip build/build-android.sh all
 
 Environment:
-  ONE_KVM_ANDROID_GRADLE_CACHE_DIR          Host Gradle cache path or Docker volume name
-  ONE_KVM_ANDROID_CARGO_REGISTRY_CACHE_DIR  Host Cargo registry cache path or Docker volume name
-  ONE_KVM_ANDROID_CARGO_GIT_CACHE_DIR       Host Cargo git cache path or Docker volume name
   ONE_KVM_ANDROID_SKIP_DOCKER_BUILD=1       Reuse an already loaded Docker image
 
 APK output:

build/build-images.sh

@@ -21,16 +21,21 @@ build_arch() {
 
     case "${CHINAMIRRO:-}" in
         1|true|TRUE|yes|YES|on|ON)
-            local cross_build_opts="${CROSS_BUILD_OPTS:+$CROSS_BUILD_OPTS }--build-arg CHINAMIRRO=1"
-            echo "=== China mirror acceleration: enabled (Tsinghua) ==="
+            local cross_build_opts="${CROSS_BUILD_OPTS:+$CROSS_BUILD_OPTS }--progress=plain --build-arg CHINAMIRRO=1 --build-arg GH_PROXY=${GH_PROXY:-https://gh-proxy.com/} --build-arg DEBIAN_IMAGE=${DEBIAN_IMAGE:-docker.1ms.run/library/debian:11}"
+            cross_build_opts="$cross_build_opts --build-arg HTTP_PROXY= --build-arg HTTPS_PROXY= --build-arg ALL_PROXY= --build-arg NO_PROXY="
+            cross_build_opts="$cross_build_opts --build-arg http_proxy= --build-arg https_proxy= --build-arg all_proxy= --build-arg no_proxy="
+            echo "=== China mirror acceleration: enabled ==="
             echo "=== Building: $rust_target (via cross with custom Dockerfile) ==="
             env \
                 CROSS_BUILD_OPTS="$cross_build_opts" \
-                CARGO_SOURCE_CRATES_IO_REPLACE_WITH=tuna \
-                CARGO_SOURCE_TUNA_REGISTRY=sparse+https://mirrors.tuna.tsinghua.edu.cn/crates.io-index/ \
+                CARGO_SOURCE_CRATES_IO_REPLACE_WITH=rsproxy-sparse \
+                CARGO_SOURCE_RSPROXY_REGISTRY=https://rsproxy.cn/crates.io-index \
+                CARGO_SOURCE_RSPROXY_SPARSE_REGISTRY=sparse+https://rsproxy.cn/index/ \
+                CARGO_REGISTRIES_RSPROXY_INDEX=https://rsproxy.cn/crates.io-index \
                 CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse \
-                RUSTUP_DIST_SERVER=https://mirrors.tuna.tsinghua.edu.cn/rustup \
-                RUSTUP_UPDATE_ROOT=https://mirrors.tuna.tsinghua.edu.cn/rustup/rustup \
+                CARGO_NET_GIT_FETCH_WITH_CLI=true \
+                RUSTUP_DIST_SERVER=https://rsproxy.cn \
+                RUSTUP_UPDATE_ROOT=https://rsproxy.cn/rustup \
                 cross build --release --target "$rust_target"
             return
             ;;
@@ -66,7 +71,7 @@ case "${1:-all}" in
         echo "Examples:"
         echo "  $0              # Build all"
         echo "  $0 x86_64       # Build x86_64 only"
-        echo "  CHINAMIRRO=1 $0 arm64  # Build with Tsinghua mirrors"
+        echo "  CHINAMIRRO=1 $0 arm64  # Build with China mirrors"
         exit 0
         ;;
     *)
@@ -83,16 +88,4 @@ for target in "${ARCH_MAP[@]}"; do
     fi
 done
 echo ""
-echo "Static libraries:"
-for target in "${ARCH_MAP[@]}"; do
-    case "$target" in
-        x86_64-unknown-linux-gnu) gnu_target="x86_64-linux-gnu" ;;
-        aarch64-unknown-linux-gnu) gnu_target="aarch64-linux-gnu" ;;
-        armv7-unknown-linux-gnueabihf) gnu_target="armv7-linux-gnueabihf" ;;
-    esac
-    if [ -d "$PROJECT_DIR/target/one-kvm-libs/$gnu_target/lib" ]; then
-        echo "  $gnu_target: OK"
-    fi
-done
-echo ""
 echo "Next step: ./build/package-docker.sh or ./build/package-deb.sh"

build/cross/Dockerfile.android

@@ -1,7 +1,8 @@
 # Android build image for One-KVM
 # Based on Debian 11 for stable toolchain/runtime compatibility
 
-FROM debian:11
+ARG DEBIAN_IMAGE=debian:11
+FROM ${DEBIAN_IMAGE}
 
 ARG CHINAMIRRO=0
 ARG ANDROID_SDK_ROOT=/root/android-sdk
@@ -10,11 +11,13 @@ ARG ANDROID_NDK_VERSION=27.3.13750724
 ARG ANDROID_PLATFORM=36
 ARG ANDROID_BUILD_TOOLS=36.0.0
 ARG CARGO_NDK_VERSION=4.1.2
-ARG RUSTUP_DIST_SERVER_CN=https://mirrors.tuna.tsinghua.edu.cn/rustup
-ARG RUSTUP_UPDATE_ROOT_CN=https://mirrors.tuna.tsinghua.edu.cn/rustup/rustup
-ARG CARGO_REGISTRY_CN=sparse+https://mirrors.tuna.tsinghua.edu.cn/crates.io-index/
+ARG RUSTUP_DIST_SERVER_CN=https://rsproxy.cn
+ARG RUSTUP_UPDATE_ROOT_CN=https://rsproxy.cn/rustup
+ARG CARGO_INDEX_CN=https://rsproxy.cn/crates.io-index
+ARG CARGO_REGISTRY_CN=sparse+https://rsproxy.cn/index/
 ARG MAVEN_REPOSITORY_CN=https://maven.aliyun.com/repository/public
 ARG GOOGLE_MAVEN_REPOSITORY_CN=https://maven.aliyun.com/repository/google
+ARG GRADLE_PLUGIN_REPOSITORY_CN=https://maven.aliyun.com/repository/gradle-plugin
 ARG GRADLE_DISTRIBUTION_URL_CN=https://mirrors.cloud.tencent.com/gradle/gradle-9.1.0-bin.zip
 ARG ANDROID_CMDLINE_TOOLS_URL=
 
@@ -29,16 +32,16 @@ ENV PATH=/root/.cargo/bin:${PATH}
 ENV ONE_KVM_GRADLE_DISTRIBUTION_URL_CN=${GRADLE_DISTRIBUTION_URL_CN}
 
 RUN if [ "$CHINAMIRRO" = "1" ]; then \
-        sed -i \
-            -e 's|http://deb.debian.org/debian|http://mirrors.tuna.tsinghua.edu.cn/debian|g' \
-            -e 's|http://security.debian.org/debian-security|http://mirrors.tuna.tsinghua.edu.cn/debian-security|g' \
+        sed -i -E \
+            -e 's|http://deb.debian.org/debian([[:space:]])|http://mirrors.tuna.tsinghua.edu.cn/debian\1|g' \
             /etc/apt/sources.list; \
     fi
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates \
     curl \
     wget \
+    bzip2 \
     unzip \
     zip \
     git \
@@ -63,11 +66,15 @@ RUN if [ "$CHINAMIRRO" = "1" ]; then \
         mkdir -p /root/.cargo; \
         printf '%s\n' \
             '[source.crates-io]' \
-            "replace-with = 'tuna'" \
-            '[source.tuna]' \
+            "replace-with = 'rsproxy-sparse'" \
+            '[source.rsproxy]' \
+            "registry = '${CARGO_INDEX_CN}'" \
+            '[source.rsproxy-sparse]' \
             "registry = '${CARGO_REGISTRY_CN}'" \
-            '[registries.tuna]' \
-            "index = '${CARGO_REGISTRY_CN}'" \
+            '[registries.rsproxy]' \
+            "index = '${CARGO_INDEX_CN}'" \
+            '[net]' \
+            'git-fetch-with-cli = true' \
             > /root/.cargo/config.toml; \
     fi \
     && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable \
@@ -102,6 +109,7 @@ RUN if [ "$CHINAMIRRO" = "1" ]; then \
             "beforeSettings { settings ->" \
             "    settings.pluginManagement.repositories.maven { url = uri('${GOOGLE_MAVEN_REPOSITORY_CN}') }" \
             "    settings.pluginManagement.repositories.maven { url = uri('${MAVEN_REPOSITORY_CN}') }" \
+            "    settings.pluginManagement.repositories.maven { url = uri('${GRADLE_PLUGIN_REPOSITORY_CN}') }" \
             "    settings.dependencyResolutionManagement.repositories.maven { url = uri('${GOOGLE_MAVEN_REPOSITORY_CN}') }" \
             "    settings.dependencyResolutionManagement.repositories.maven { url = uri('${MAVEN_REPOSITORY_CN}') }" \
             "}" \
@@ -238,7 +246,9 @@ RUN printf '%s\n' \
         '    '"'"' "$WRAPPER_PROPERTIES" > "$WRAPPER_PROPERTIES_TMP"' \
         '    cp "$WRAPPER_PROPERTIES_TMP" "$WRAPPER_PROPERTIES"' \
         '    rm -f "$WRAPPER_PROPERTIES_TMP"' \
-        '    find /root/.gradle/wrapper/dists -name "*.lck" -o -name "*.part" 2>/dev/null | xargs -r rm -f' \
+        '    if [[ -d /root/.gradle/wrapper/dists ]]; then' \
+        '        find /root/.gradle/wrapper/dists \( -name "*.lck" -o -name "*.part" \) -print0 | xargs -0 -r rm -f' \
+        '    fi' \
         'fi' \
         '' \
         'ensure_keystore' \