Skip to content

Commit 2e83b7a

Browse files
Try setting all NDK env vars
1 parent 950b6f8 commit 2e83b7a

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

.github/workflows/cpp-packaging.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -551,10 +551,13 @@ jobs:
551551
python scripts/gha/restore_secrets.py --passphrase "${{ secrets.TEST_SECRET }}"
552552
- name: Build integration tests (and run Desktop tests)
553553
# The set up script for Android will download the NDK here.
554-
# Need to export from bash, so that /tmp gets converted on Windows.
554+
# Need to export from bash, so that /tmp gets converted on Windows.
555+
env:
556+
NDK_ROOT: /tmp/android-ndk-r16b
557+
ANDROID_NDK_HOME: /tmp/android-ndk-r16b
558+
ANDROID_NDK_PATH: /tmp/android-ndk-r16b
555559
shell: bash
556560
run: |
557-
export NDK_ROOT=/tmp/android-ndk-r16b
558561
python scripts/gha/build_testapps.py --t ${{ env.apis }} --p ${{ matrix.target_platform }} --sdk_dir firebase_cpp_sdk --output_directory ${{ github.workspace }} --execute_desktop_testapp --noadd_timestamp
559562
560563
# Workaround for https://github.com/GoogleCloudPlatform/github-actions/issues/100

.github/workflows/integration_tests.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,11 @@ jobs:
116116
117117
- name: Build integration tests (and run Desktop tests)
118118
# The set up script for Android will download the NDK here.
119-
# Need to export from bash, so that /tmp gets converted on Windows.
119+
# Need to use bash, so that /tmp gets converted on Windows.
120+
env:
121+
NDK_ROOT: /tmp/android-ndk-r16b
122+
ANDROID_NDK_HOME: /tmp/android-ndk-r16b
123+
ANDROID_NDK_PATH: /tmp/android-ndk-r16b
120124
shell: bash
121125
run: |
122126
export NDK_ROOT=/tmp/android-ndk-r16b

0 commit comments

Comments
 (0)