Browse Source

更新安卓构建流程

dengdx 2 days ago
parent
commit
a1e6c4ec26
1 changed files with 13 additions and 8 deletions
  1. 13 8
      .github/workflows/build-linux-arm-appimage.yml

+ 13 - 8
.github/workflows/build-linux-arm-appimage.yml

@@ -95,7 +95,7 @@ jobs:
         run: npm install --force
         run: npm install --force
       - name: 构建h5
       - name: 构建h5
         run: npm run h5_for_production
         run: npm run h5_for_production
-        
+
       - name: Set up JDK 17
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         uses: actions/setup-java@v4
         with:
         with:
@@ -105,16 +105,21 @@ jobs:
       - name: Set up Android SDK (包括 build-tools 35.0.0)
       - name: Set up Android SDK (包括 build-tools 35.0.0)
         uses: android-actions/setup-android@v3
         uses: android-actions/setup-android@v3
         with:
         with:
-          sdk-version: '35'
-          build-tools: '35.0.0'
-          # Windows 上会安装到 %LOCALAPPDATA%\Android\Sdk
-
-      - name: Cache Android SDK
+          cmdline-tools-version: 12266719  # 默认 16.0,确保兼容
+          packages: >-  # 多行 YAML,避免空格问题
+            tools
+            platform-tools
+            platforms;android-35
+            build-tools;35.0.0
+          accept-android-sdk-licenses: true
+          log-accepted-android-sdk-licenses: true
+
+      - name: Cache Android SDK  # 新增:缓存 SDK,避免每次下载
         uses: actions/cache@v4
         uses: actions/cache@v4
         with:
         with:
           path: |
           path: |
-            %LOCALAPPDATA%\Android\Sdk
-          key: android-sdk-${{ runner.os }}-${{ hashFiles('**/*.xml') }}
+            %LOCALAPPDATA%\Android\Sdk  # 备选用户目录
+          key: android-sdk-${{ runner.os }}-${{ hashFiles('**/*.xml') }}  # 基于项目文件 hash
 
 
       - name: Set up Node.js (for Cordova)
       - name: Set up Node.js (for Cordova)
         uses: actions/setup-node@v4
         uses: actions/setup-node@v4