Browse Source

更新android构建脚本和工作流

dengdx 2 days ago
parent
commit
db5e9bea92
2 changed files with 19 additions and 2 deletions
  1. 4 0
      .build/build-android.js
  2. 15 2
      .github/workflows/build-linux-arm-appimage.yml

+ 4 - 0
.build/build-android.js

@@ -3,6 +3,7 @@ const fs   = require('fs');
 const path = require('path');
 const { execSync } = require('child_process');
 const { rmSync } = require('fs');
+const { exec } = require('cordova');
 
 // 计算各路径
 const rootDir   = path.join(__dirname, '..');          // 项目根目录
@@ -11,6 +12,9 @@ const srcDir = path.join(rootDir, 'dist', 'h5');       // ../dist/h5
 const dstDir = path.join(cordovaPrjDir, 'www');
 
 rmSync('.build/dros', { recursive: true, force: true });
+// 做一些环境检查
+execSync('npx cordova --version', { stdio: 'inherit' });
+execSync('npx cordova requirements', { stdio: 'inherit' });
 // 1. 在项目根目录执行 cordova create
 execSync('npx cordova create .build/dros zskk.dros dros', { cwd: rootDir, stdio: 'inherit' });
 

+ 15 - 2
.github/workflows/build-linux-arm-appimage.yml

@@ -76,11 +76,24 @@ jobs:
     steps:
       - name: 检出代码
         uses: actions/checkout@v4
-
+      - name: Check Android SDK on Windows (cmd)
+        shell: cmd
+        env:
+          ANDROID_SDK_ROOT: 'C:\Users\ddx\AppData\Local\Android\Sdk'            # <-- 修改为你的 SDK 安装路径
+          JAVA_HOME: 'C:\Program Files\Eclipse Adoptium\jdk-17.0.16.8-hotspot\'     # <-- 修改为你的 JDK 路径
+          PATH: ${{ env.PATH }}';C:\Android\sdk\platform-tools;C:\Android\sdk\cmdline-tools\latest\bin'
+        run: |
+          echo USER: %USERNAME%
+          echo ANDROID_SDK_ROOT: %ANDROID_SDK_ROOT%
+          where sdkmanager || echo sdkmanager not found in PATH
+          sdkmanager --list
+          echo y|sdkmanager --licenses
+          java -version
+          
       - name: 设置 Node.js 环境
         uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '22'
 
       - name: 安装依赖
         run: npm install --force