v1.4.2

Author: Ar3h

.github/workflows/build-and-release.yml

@@ -177,24 +177,51 @@ jobs:
           name: base-artifacts
           path: base
 
-      - name: Download Temurin JDK 8 (${{ matrix.suffix }})
+      - name: Download JDK 8 (${{ matrix.suffix }})
         run: |
-          # 使用 Eclipse Adoptium API 获取最新的 JDK 8 下载链接
+          # 默认使用 Adoptium API
           API_URL="https://api.adoptium.net/v3/binary/latest/8/ga/${{ matrix.os_api }}/${{ matrix.arch_api }}/jdk/hotspot/normal/eclipse"
           
+          # 特殊处理：如果遇到 macOS aarch64，改用 Azul Zulu 下载链接
+          if [ "${{ matrix.os_api }}" == "mac" ] && [ "${{ matrix.arch_api }}" == "aarch64" ]; then
+             echo "Detected macOS aarch64 (Apple Silicon). Adoptium does not provide JDK 8 for this arch."
+             echo "Switching to Azul Zulu OpenJDK 8..."
+             # Azul Zulu JDK 8 for macOS ARM64 (这是直接下载链接，版本可能会变，建议使用 latest API 或固定版本)
+             # 为了稳定性，这里使用 Azul 的 API 获取最新 JDK 8 LTS
+             API_URL="https://api.azul.com/zulu/download/community/v1.0/bundles/latest/binary/?jdk_version=8&os=macos&arch=arm64&bundle_type=jdk&ext=tar.gz"
+          fi
+          
           echo "Fetching JDK from: $API_URL"
           
           if [ "${{ matrix.ext }}" == "zip" ]; then
+            # Windows
             curl -L "$API_URL" -o jdk_bundle.zip
             unzip -q jdk_bundle.zip -d jdk_extracted
           else
+            # Linux / Mac
             curl -L "$API_URL" -o jdk_bundle.tar.gz
             mkdir jdk_extracted
             tar -xzf jdk_bundle.tar.gz -C jdk_extracted
           fi
           
           # 重命名提取出的 JDK 目录为统一名称 'jdk'
-          mv jdk_extracted/* jdk_final
+          # 注意：Azul 和 Adoptium 解压后的目录结构可能略有不同，需要通配符处理
+          # Azul 通常解压后是 zulu8.xx.xx-ca-jdk8.0.xx-macosx_aarch64
+          # Adoptium 解压后是 jdk8uXXX-bXX
+          
+          # 找到 jdk_extracted 下唯一的子目录并移动内容
+          SUBDIR=$(ls jdk_extracted | head -n 1)
+          mv "jdk_extracted/$SUBDIR" jdk_final
+          
+          # macOS 特殊处理：macOS 的 JDK 结构通常是 /Contents/Home 才是真正的 JAVA_HOME
+          if [ "${{ matrix.os_api }}" == "mac" ]; then
+             if [ -d "jdk_final/Contents/Home" ]; then
+               echo "Detected macOS bundle structure. Adjusting root..."
+               mv jdk_final/Contents/Home jdk_real
+               rm -rf jdk_final
+               mv jdk_real jdk_final
+             fi
+          fi
 
       - name: Create Distribution Structure
         run: |
@@ -216,7 +243,6 @@ jobs:
         if: matrix.os_api != 'windows'
         run: |
           cd ${{ env.DIST_DIR }}
-          # 创建启动脚本，强制使用内置 JDK
           cat <<EOF > start.sh
           #!/bin/bash
           BASE_DIR=\$(cd "\$(dirname "\$0")" && pwd)