Skip to content

Commit 33a9d4d

Browse files
committed
Set the NDK path before installing the Android SDK, as that will reset the SDK home to a different path
1 parent 907438f commit 33a9d4d

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.github/workflows/release_crypto.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,10 @@ jobs:
4747
java-version: '17'
4848
distribution: 'temurin' # See 'Supported distributions' for available options
4949

50-
- name: Install android sdk
51-
uses: malinskiy/action-android/install-sdk@release/0.1.4
52-
5350
- name: Configure android ndk
5451
run: |
5552
NDK_PATH=$ANDROID_HOME/ndk/$NDK_VERSION
53+
echo $NDK_PATH
5654
if [ -d "$NDK_PATH" ]; then
5755
echo "ANDROID_NDK_HOME=$NDK_PATH" >> $GITHUB_ENV
5856
echo "Using ndk $NDK_PATH"
@@ -61,6 +59,9 @@ jobs:
6159
exit 1
6260
fi
6361
62+
- name: Install android sdk
63+
uses: malinskiy/action-android/install-sdk@release/0.1.4
64+
6465
- name: Install Rust
6566
uses: dtolnay/rust-toolchain@stable
6667

.github/workflows/release_sdk_parallel.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,10 @@ jobs:
4747
java-version: '17'
4848
distribution: 'temurin' # See 'Supported distributions' for available options
4949

50-
- name: Install android sdk
51-
uses: malinskiy/action-android/install-sdk@release/0.1.4
52-
5350
- name: Configure android ndk
5451
run: |
5552
NDK_PATH=$ANDROID_HOME/ndk/$NDK_VERSION
53+
echo $NDK_PATH
5654
if [ -d "$NDK_PATH" ]; then
5755
echo "ANDROID_NDK_HOME=$NDK_PATH" >> $GITHUB_ENV
5856
echo "Using ndk $NDK_PATH"
@@ -61,6 +59,9 @@ jobs:
6159
exit 1
6260
fi
6361
62+
- name: Install android sdk
63+
uses: malinskiy/action-android/install-sdk@release/0.1.4
64+
6465
- name: Install Rust
6566
uses: dtolnay/rust-toolchain@stable
6667

0 commit comments

Comments
 (0)