From 82206e5c9da7e20f3d70e9e790af69e940d9746c Mon Sep 17 00:00:00 2001
From: Ed Tubbs <ectubbs@gmail.com>
Date: Mon, 4 Sep 2023 16:44:58 +0000
Subject: [PATCH] ci: added test for aarch64-android

ci: restored macos sdk to 12.2
test: added tmp file path for android to logdb and wallet tests
---
 .github/workflows/ci.yml     | 42 +++++++++++++++++++++++++++++++-----
 src/logdb/test/logdb_tests.c |  4 ++++
 test/wallet_tests.c          |  4 ++++
 3 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 015d7b9e6..311d08eb7 100755
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -58,8 +58,8 @@ jobs:
             os: ubuntu-20.04
             packages: unzip
             dep-opts: "CROSS_COMPILE='yes' SPEED=slow V=1"
-            config-opts: "--enable-static --disable-shared"
-            run-tests: false
+            config-opts: "--enable-static --disable-shared --enable-test-passwd"
+            run-tests: true
             goal: install
             android-ndk: android-ndk-r25c-linux
             android-ndk-shasum: "769ee342ea75f80619d985c2da990c48b3d8eaf45f48783a2d48870d04b46108"
@@ -87,9 +87,9 @@ jobs:
             config-opts: "--enable-static --disable-shared --enable-test-passwd"
             packages: cmake zlib xorriso
             goal: install
-            mac-sdk: 12.1
-            mac-sdk-build: 12A7403
-            mac-sdk-shasum: "be17f48fd0b08fb4dcd229f55a6ae48d9f781d210839b4ea313ef17dd12d6ea5"
+            mac-sdk: 12.2
+            mac-sdk-build: 12B45b
+            mac-sdk-shasum: "df75d30ecafc429e905134333aeae56ac65fac67cb4182622398fd717df77619"
           # - name: arm64-macos
           #   host: arm64-apple-darwin
           #   os: macos-latest
@@ -329,6 +329,38 @@ jobs:
               make
               make simulate
               ;;
+              "aarch64-android"):
+              wget https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip
+              unzip commandlinetools-linux-6858069_latest.zip
+              mkdir -p ~/.android-sdk/cmdline-tools/latest
+              mv cmdline-tools/* ~/.android-sdk/cmdline-tools/latest
+              export ANDROID_SDK_ROOT=~/.android-sdk
+              export PATH=$PATH:$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$ANDROID_SDK_ROOT/platform-tools
+              yes | sdkmanager --licenses --sdk_root=$ANDROID_SDK_ROOT
+              sdkmanager --update --sdk_root=$ANDROID_SDK_ROOT
+              sdkmanager "platform-tools" --sdk_root=$ANDROID_SDK_ROOT
+              DOCKER_IMAGE=us-docker.pkg.dev/android-emulator-268719/images/r-google-x64:30.0.23
+              PORT=15555
+              container_id=$(docker run -d \
+                --device /dev/kvm \
+                --publish 8554:8554/tcp \
+                --publish $PORT:5555/tcp \
+                -e TOKEN="$(cat ~/.emulator_console_auth_token)" \
+                -e ADBKEY="$(cat ~/.android/adbkey)" \
+                $DOCKER_IMAGE)
+              echo "The container is running with id: $container_id"
+              adb connect localhost:$PORT
+              adb wait-for-device
+              while [ "$(adb shell getprop sys.boot_completed | tr -d '\r')" != "1" ]; do
+                sleep 1
+              done
+              echo "The device is ready"
+              adb push ./tests /data/local/tmp/
+              adb shell "mkdir -p /data/local/tmp/test"
+              adb push ./test/wordlist /data/local/tmp/test
+              adb shell "cd /data/local/tmp/; chmod 755 tests; ./tests"
+              echo "docker stop ${container_id}"
+              ;;
               *)
               make check -j"$(getconf _NPROCESSORS_ONLN)" V=1
               ;;
diff --git a/src/logdb/test/logdb_tests.c b/src/logdb/test/logdb_tests.c
index aeed3765b..bed0c7aa2 100644
--- a/src/logdb/test/logdb_tests.c
+++ b/src/logdb/test/logdb_tests.c
@@ -17,8 +17,12 @@
 static const char *dbtmpfile = "dummy";
 #else
 #include <unistd.h>
+#ifdef __ANDROID__
+static const char *dbtmpfile = "/data/local/tmp/dummy";
+#else
 static const char *dbtmpfile = "/tmp/dummy";
 #endif
+#endif
 
 #include <errno.h>
 
diff --git a/test/wallet_tests.c b/test/wallet_tests.c
index 382bd2e8e..b69184fa3 100644
--- a/test/wallet_tests.c
+++ b/test/wallet_tests.c
@@ -12,8 +12,12 @@
 static const char *wallettmpfile = "dummy";
 #else
 #include <unistd.h>
+#ifdef __ANDROID__
+static const char *wallettmpfile = "/data/local/tmp/dummy";
+#else
 static const char *wallettmpfile = "/tmp/dummy";
 #endif
+#endif
 
 #include <test/utest.h>