Skip to content

Commit 0f91521

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

File tree

1 file changed

+37
-1
lines changed

1 file changed

+37
-1
lines changed

.github/workflows/CI.yml

Lines changed: 37 additions & 1 deletion
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]
95+
- host: [self-hosted, windows, arm64, ARM]
9696
target: aarch64-pc-windows-msvc
9797
build: pnpm build --target aarch64-pc-windows-msvc
9898
# - host: [self-hosted, linux]
@@ -270,6 +270,16 @@ jobs:
270270
echo "CC_armv7_pc_windows_msvc=$NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang" >> $GITHUB_ENV
271271
echo "AR_armv7_pc_windows_msvc=$NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" >> $GITHUB_ENV
272272
fi
273+
274+
# Debug: Print environment variables
275+
echo "=== Environment Variables Debug ==="
276+
echo "ANDROID_NDK_ROOT: $ANDROID_NDK_ROOT"
277+
echo "TARGET_CC: $TARGET_CC"
278+
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"
281+
echo "PATH: $PATH"
282+
echo "=== End Debug ==="
273283
274284
- uses: mlugg/setup-zig@v2
275285
if: ${{ contains(matrix.settings.target, 'musl') }}
@@ -304,6 +314,32 @@ jobs:
304314
"%USERPROFILE%\.cargo\bin\rustc.exe" --version
305315
shell: cmd
306316

317+
- name: Verify Android Environment (Android targets)
318+
if: ${{ contains(matrix.settings.target, 'android') }}
319+
run: |
320+
echo "=== Android Environment Verification ==="
321+
echo "ANDROID_NDK_ROOT: $ANDROID_NDK_ROOT"
322+
echo "TARGET_CC: $TARGET_CC"
323+
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"
326+
echo "PATH: $PATH"
327+
echo "=== Checking NDK tools ==="
328+
ls -la "$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/" | head -10
329+
echo "=== Checking specific tools ==="
330+
if [ -f "$TARGET_CC" ]; then
331+
echo "TARGET_CC exists: $TARGET_CC"
332+
else
333+
echo "TARGET_CC NOT FOUND: $TARGET_CC"
334+
fi
335+
if [ -f "$TARGET_AR" ]; then
336+
echo "TARGET_AR exists: $TARGET_AR"
337+
else
338+
echo "TARGET_AR NOT FOUND: $TARGET_AR"
339+
fi
340+
echo "=== End Verification ==="
341+
shell: bash
342+
307343
- name: Build (Windows)
308344
if: ${{ contains(matrix.settings.host, 'windows') }}
309345
run: |

0 commit comments

Comments
 (0)