Skip to content

Commit 0e6b472

Browse files
committed
Merge #335: Use version 21 of the Android NDK in the CI test, build, and publish workflows
beb75dd Use version 21 of the Android NDK in the CI test, build, and publish workflows (thunderbiscuit) Pull request description: This PR reverts an update to our Android CI workflows. For info on why this is needed, see issues #242 and #243. ACKs for top commit: notmandatory: ACK beb75dd Tree-SHA512: dfee0b1f335318b86fa490fa85e7ef5d7a032e01a78db64a186c5d75e9e77e8f0e2af58ee5407d4fe38a0aa3aabbc7b06b23189aef0dfaad1d246a354452870d
2 parents 5ee8698 + beb75dd commit 0e6b472

File tree

2 files changed

+36
-6
lines changed

2 files changed

+36
-6
lines changed

.github/workflows/publish-android.yaml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,24 @@
11
name: Publish bdk-android to Maven Central
22
on: [workflow_dispatch]
33

4+
# The default Android NDK on the ubuntu-22.04 image is 25.2.9519653
5+
# We replace the default environment variable ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/25.2.9519653
6+
# with an older version of the NDK (21.4.7075529) using the fix proposed here: https://github.com/actions/runner-images/issues/5930
7+
# For information on why this is needed at the moment see issues #242 and #243, and PR #282
8+
env:
9+
ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/21.4.7075529
10+
411
jobs:
512
build:
6-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-22.04
714
steps:
15+
- name: "Install Android NDK 21.4.7075529"
16+
run: |
17+
ANDROID_ROOT=/usr/local/lib/android
18+
ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
19+
SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
20+
echo "y" | $SDKMANAGER "ndk;21.4.7075529"
21+
822
- name: "Check out PR branch"
923
uses: actions/checkout@v2
1024

.github/workflows/test-android.yaml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,24 @@ on:
99
- "bdk-ffi/**"
1010
- "bdk-android/**"
1111

12+
# The default Android NDK on the ubuntu-22.04 image is 25.2.9519653
13+
# We replace the default environment variable ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/25.2.9519653
14+
# with an older version of the NDK (21.4.7075529) using the fix proposed here: https://github.com/actions/runner-images/issues/5930
15+
# For information on why this is needed at the moment see issues #242 and #243, and PR #282
16+
env:
17+
ANDROID_NDK_ROOT: /usr/local/lib/android/sdk/ndk/21.4.7075529
18+
1219
jobs:
1320
build:
14-
runs-on: ubuntu-20.04
21+
runs-on: ubuntu-22.04
1522
steps:
23+
- name: "Install Android NDK 21.4.7075529"
24+
run: |
25+
ANDROID_ROOT=/usr/local/lib/android
26+
ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
27+
SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
28+
echo "y" | $SDKMANAGER "ndk;21.4.7075529"
29+
1630
- name: "Check out PR branch"
1731
uses: actions/checkout@v2
1832

@@ -34,7 +48,9 @@ jobs:
3448
- name: "Install Rust Android targets"
3549
run: rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi
3650

37-
- name: "Run Android tests"
38-
run: |
39-
cd bdk-android
40-
./gradlew test --console=rich
51+
# There are currently no unit tests for bdk-android and the integration tests require the macOS image
52+
# which is not working with the older NDK version we are using, so for now we just make sure that the library builds.
53+
# - name: "Run Android unit tests"
54+
# run: |
55+
# cd bdk-android
56+
# ./gradlew test --console=rich

0 commit comments

Comments
 (0)