From e3ce1ca633dcef6f4bce91aea6e50d71de2f4f98 Mon Sep 17 00:00:00 2001 From: Layue13 Date: Thu, 19 Nov 2026 16:20:17 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E4=BB=8E=E6=B8=85=E5=8D=8E=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E5=8F=96=20Temurin=2017,=E4=B8=8D=E5=86=8D=E4=BB=8E?= =?UTF-8?q?=20github.com=20=E4=B8=8B=E8=BD=BD=20JDK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit runner(mmhome)直连 github.com 只有约 50KB/s,setup-java 下载 330MB 的 Liberica 17 Full 会一直卡到 90 分钟总超时(2026-11-19 的发版和 PR 检查都因此失败)。清华镜像到 runner 约 35MB/s。 改成先从镜像取 Temurin 17(sha256 与官方发布页一致),用 jdkfile 安装;JavaFX 由 Gradle 构建自己拉 (本机用不带 JavaFX 的 Temurin 17 跑 :HMCL:makeExecutables 通过)。取不到镜像时回退到原来的下载方式。 Co-Authored-By: Claude Sonnet 5.5 --- .github/workflows/gradle.yml | 25 ++++++++++++++++++++++++- .github/workflows/publish-tdlm.yml | 25 ++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index d0ee3be478..210a918981 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -27,7 +27,30 @@ jobs: - uses: actions/checkout@v6 # Same pattern as TDLM ForestryMC/IndustrialCraft2 setup-build: cache the JDK toolchain. - - name: Set up JDK 17 + # runner(mmhome)直连 github.com 只有约 50KB/s,setup-java 下载 JDK 会一直卡到总超时。 + # 清华镜像到 runner 约 35MB/s:从镜像取 Temurin 17(sha256 与官方发布页一致),用 jdkfile 安装。 + # JavaFX 不在 Temurin 里,由 Gradle 构建自己拉。取不到镜像时回退到原来的 Liberica 下载。 + - name: Fetch JDK 17 (Temurin) from the Tsinghua mirror + id: jdk + continue-on-error: true + env: + JDK_URL: https://mirrors.tuna.tsinghua.edu.cn/Adoptium/17/jdk/x64/linux/OpenJDK17U-jdk_x64_linux_hotspot_17.0.21_9.tar.gz + JDK_SHA256: 8b9b611d917e3dfd8419d3566b5949226f69b052fed7e109c1368add1dfe8711 + run: | + set -euo pipefail + curl -fsSL --retry 3 --connect-timeout 20 --max-time 600 -o "$RUNNER_TEMP/jdk17.tar.gz" "$JDK_URL" + echo "$JDK_SHA256 $RUNNER_TEMP/jdk17.tar.gz" | sha256sum -c - + + - name: Set up JDK 17 (from the mirror) + if: steps.jdk.outcome == 'success' + uses: actions/setup-java@v6 + with: + distribution: jdkfile + jdkFile: ${{ runner.temp }}/jdk17.tar.gz + java-version: '17' + + - name: Set up JDK 17 + JavaFX (download fallback) + if: steps.jdk.outcome != 'success' uses: actions/setup-java@v6 with: distribution: 'liberica' diff --git a/.github/workflows/publish-tdlm.yml b/.github/workflows/publish-tdlm.yml index 90fe0b2415..fa2967bf14 100644 --- a/.github/workflows/publish-tdlm.yml +++ b/.github/workflows/publish-tdlm.yml @@ -46,7 +46,30 @@ jobs: - uses: actions/checkout@v6 # Same caching pattern as gradle.yml / TDLM ForestryMC+IC2 setup-build. - - name: Set up JDK 17 + JavaFX + # runner(mmhome)直连 github.com 只有约 50KB/s,setup-java 下载 JDK 会一直卡到总超时。 + # 清华镜像到 runner 约 35MB/s:从镜像取 Temurin 17(sha256 与官方发布页一致),用 jdkfile 安装。 + # JavaFX 不在 Temurin 里,由 Gradle 构建自己拉。取不到镜像时回退到原来的 Liberica 下载。 + - name: Fetch JDK 17 (Temurin) from the Tsinghua mirror + id: jdk + continue-on-error: true + env: + JDK_URL: https://mirrors.tuna.tsinghua.edu.cn/Adoptium/17/jdk/x64/linux/OpenJDK17U-jdk_x64_linux_hotspot_17.0.21_9.tar.gz + JDK_SHA256: 8b9b611d917e3dfd8419d3566b5949226f69b052fed7e109c1368add1dfe8711 + run: | + set -euo pipefail + curl -fsSL --retry 3 --connect-timeout 20 --max-time 600 -o "$RUNNER_TEMP/jdk17.tar.gz" "$JDK_URL" + echo "$JDK_SHA256 $RUNNER_TEMP/jdk17.tar.gz" | sha256sum -c - + + - name: Set up JDK 17 (from the mirror) + if: steps.jdk.outcome == 'success' + uses: actions/setup-java@v6 + with: + distribution: jdkfile + jdkFile: ${{ runner.temp }}/jdk17.tar.gz + java-version: '17' + + - name: Set up JDK 17 + JavaFX (download fallback) + if: steps.jdk.outcome != 'success' uses: actions/setup-java@v6 with: distribution: 'liberica'