Skip to content

Commit 285a8d2

Browse files
committed
ci: fix in windows/android environment
1 parent 0f91521 commit 285a8d2

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

.github/workflows/CI.yml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
- host: [self-hosted, linux]
9393
target: aarch64-unknown-linux-musl
9494
build: pnpm build --target aarch64-unknown-linux-musl -x
95-
- host: [self-hosted, windows, arm64, ARM]
95+
- host: [self-hosted, windows, ARM]
9696
target: aarch64-pc-windows-msvc
9797
build: pnpm build --target aarch64-pc-windows-msvc
9898
# - host: [self-hosted, linux]
@@ -273,11 +273,17 @@ jobs:
273273
274274
# Debug: Print environment variables
275275
echo "=== Environment Variables Debug ==="
276+
echo "Target: ${{ matrix.settings.target }}"
276277
echo "ANDROID_NDK_ROOT: $ANDROID_NDK_ROOT"
277278
echo "TARGET_CC: $TARGET_CC"
278279
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
281287
echo "PATH: $PATH"
282288
echo "=== End Debug ==="
283289
@@ -318,14 +324,18 @@ jobs:
318324
if: ${{ contains(matrix.settings.target, 'android') }}
319325
run: |
320326
echo "=== Android Environment Verification ==="
327+
echo "Target: ${{ matrix.settings.target }}"
321328
echo "ANDROID_NDK_ROOT: $ANDROID_NDK_ROOT"
322329
echo "TARGET_CC: $TARGET_CC"
323330
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
326338
echo "PATH: $PATH"
327-
echo "=== Checking NDK tools ==="
328-
ls -la "$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/" | head -10
329339
echo "=== Checking specific tools ==="
330340
if [ -f "$TARGET_CC" ]; then
331341
echo "TARGET_CC exists: $TARGET_CC"

0 commit comments

Comments
 (0)