|
92 | 92 | - host: [self-hosted, linux] |
93 | 93 | target: aarch64-unknown-linux-musl |
94 | 94 | build: pnpm build --target aarch64-unknown-linux-musl -x |
95 | | - - host: [self-hosted, windows, arm64, ARM] |
| 95 | + - host: [self-hosted, windows, ARM] |
96 | 96 | target: aarch64-pc-windows-msvc |
97 | 97 | build: pnpm build --target aarch64-pc-windows-msvc |
98 | 98 | # - host: [self-hosted, linux] |
@@ -273,11 +273,17 @@ jobs: |
273 | 273 | |
274 | 274 | # Debug: Print environment variables |
275 | 275 | echo "=== Environment Variables Debug ===" |
| 276 | + echo "Target: ${{ matrix.settings.target }}" |
276 | 277 | echo "ANDROID_NDK_ROOT: $ANDROID_NDK_ROOT" |
277 | 278 | echo "TARGET_CC: $TARGET_CC" |
278 | 279 | echo "TARGET_AR: $TARGET_AR" |
279 | | - echo "CC_aarch64_linux_android: $CC_aarch64_linux_android" |
280 | | - echo "AR_aarch64_linux_android: $AR_aarch64_linux_android" |
| 280 | + if [[ "${{ matrix.settings.target }}" == "aarch64-linux-android" ]]; then |
| 281 | + echo "CC_aarch64_linux_android: $CC_aarch64_linux_android" |
| 282 | + echo "AR_aarch64_linux_android: $AR_aarch64_linux_android" |
| 283 | + elif [[ "${{ matrix.settings.target }}" == "armv7-linux-androideabi" ]]; then |
| 284 | + echo "CC_armv7_linux_androideabi: $CC_armv7_linux_androideabi" |
| 285 | + echo "AR_armv7_linux_androideabi: $AR_armv7_linux_androideabi" |
| 286 | + fi |
281 | 287 | echo "PATH: $PATH" |
282 | 288 | echo "=== End Debug ===" |
283 | 289 | |
@@ -318,14 +324,18 @@ jobs: |
318 | 324 | if: ${{ contains(matrix.settings.target, 'android') }} |
319 | 325 | run: | |
320 | 326 | echo "=== Android Environment Verification ===" |
| 327 | + echo "Target: ${{ matrix.settings.target }}" |
321 | 328 | echo "ANDROID_NDK_ROOT: $ANDROID_NDK_ROOT" |
322 | 329 | echo "TARGET_CC: $TARGET_CC" |
323 | 330 | echo "TARGET_AR: $TARGET_AR" |
324 | | - echo "CC_aarch64_linux_android: $CC_aarch64_linux_android" |
325 | | - echo "AR_aarch64_linux_android: $AR_aarch64_linux_android" |
| 331 | + if [[ "${{ matrix.settings.target }}" == "aarch64-linux-android" ]]; then |
| 332 | + echo "CC_aarch64_linux_android: $CC_aarch64_linux_android" |
| 333 | + echo "AR_aarch64_linux_android: $AR_aarch64_linux_android" |
| 334 | + elif [[ "${{ matrix.settings.target }}" == "armv7-linux-androideabi" ]]; then |
| 335 | + echo "CC_armv7_linux_androideabi: $CC_armv7_linux_androideabi" |
| 336 | + echo "AR_armv7_linux_androideabi: $AR_armv7_linux_androideabi" |
| 337 | + fi |
326 | 338 | echo "PATH: $PATH" |
327 | | - echo "=== Checking NDK tools ===" |
328 | | - ls -la "$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/" | head -10 |
329 | 339 | echo "=== Checking specific tools ===" |
330 | 340 | if [ -f "$TARGET_CC" ]; then |
331 | 341 | echo "TARGET_CC exists: $TARGET_CC" |
|
0 commit comments