|
@@ -92,19 +92,7 @@ jobs:
|
|
|
with:
|
|
|
node-version: '22'
|
|
|
|
|
|
- - name: 安装依赖
|
|
|
- run: npm install --force --registry=https://registry.npmmirror.com/
|
|
|
-
|
|
|
- - name: 构建h5
|
|
|
- run: node .build/h5_for_production.js
|
|
|
-
|
|
|
- - name: Set up JDK 17
|
|
|
- uses: actions/setup-java@v4
|
|
|
- with:
|
|
|
- java-version: '17'
|
|
|
- distribution: 'temurin'
|
|
|
-
|
|
|
- - name: 手动安装 Android SDK (Windows)
|
|
|
+ - name: 手动安装 Android SDK (Windows) ############为了早点调试到
|
|
|
if: runner.os == 'Windows'
|
|
|
shell: powershell
|
|
|
run: |
|
|
@@ -129,12 +117,25 @@ jobs:
|
|
|
echo "ANDROID_HOME=$sdkRoot" >> $env:GITHUB_ENV
|
|
|
echo "ANDROID_SDK_ROOT=$sdkRoot" >> $env:GITHUB_ENV
|
|
|
|
|
|
- # 使用变量避免字符串解析问题
|
|
|
- $sdkManager = "$cmdlineTools\bin\sdkmanager.bat"
|
|
|
- $sdkRootParam = "--sdk_root=$sdkRoot"
|
|
|
+ # 使用数组参数避免字符串解析问题
|
|
|
+ $sdkManager = Join-Path $cmdlineTools "bin\sdkmanager.bat"
|
|
|
|
|
|
- & $sdkManager --install "platforms;android-35" "build-tools;35.0.0" $sdkRootParam
|
|
|
- echo y | & $sdkManager --licenses $sdkRootParam
|
|
|
+ & $sdkManager @("--install", "platforms;android-35", "build-tools;35.0.0", "--sdk_root=$sdkRoot")
|
|
|
+ echo y | & $sdkManager @("--licenses", "--sdk_root=$sdkRoot")
|
|
|
+
|
|
|
+ - name: 安装依赖
|
|
|
+ run: npm install --force --registry=https://registry.npmmirror.com/
|
|
|
+
|
|
|
+ - name: 构建h5
|
|
|
+ run: node .build/h5_for_production.js
|
|
|
+
|
|
|
+ - name: Set up JDK 17
|
|
|
+ uses: actions/setup-java@v4
|
|
|
+ with:
|
|
|
+ java-version: '17'
|
|
|
+ distribution: 'temurin'
|
|
|
+
|
|
|
+
|
|
|
|
|
|
- name: 手动安装 Android SDK (Linux)
|
|
|
if: runner.os == 'Linux'
|