From f65ec8e79f6dd8149282f59071baf372018dc4ed Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Thu, 2 Sep 2021 12:01:36 -0400 Subject: [PATCH] make ci try building the flutter apk in the android apk pipeline --- .drone.jsonnet | 8 +++++++- contrib/ci/drone-static-upload.sh | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 436a039ee..330d90fe6 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -76,7 +76,13 @@ local apk_builder(name, image, extra_cmds=[], allow_fail=false, jobs=6) = { [if allow_fail then "failure"]: "ignore", environment: { SSH_KEY: { from_secret: "SSH_KEY" }, ANDROID: "android" }, commands: [ - 'VERBOSE=1 JOBS='+jobs+' NDK=/usr/lib/android-ndk ./contrib/android.sh' + 'VERBOSE=1 JOBS='+jobs+' NDK=/usr/lib/android-ndk ./contrib/android.sh', + 'git clone https://github.com/oxen-io/lokinet-mobile', + 'cp -av lokinet-jni-*/* lokinet-mobile/lokinet_lib/android/src/main/jniLibs/', + 'cd lokinet-mobile', + 'flutter build apk --debug', + 'cd ..', + 'cp lokinet-mobile/build/app/outputs/apk/debug/app-debug.apk lokinet.apk' ] + extra_cmds } ] diff --git a/contrib/ci/drone-static-upload.sh b/contrib/ci/drone-static-upload.sh index bdbd57561..9c5879f09 100755 --- a/contrib/ci/drone-static-upload.sh +++ b/contrib/ci/drone-static-upload.sh @@ -42,6 +42,7 @@ if [ -e build-windows ]; then elif [ -e build-android ] ; then # android af ngl cp -av lokinet-jni-* "$base" + cp -av *.apk "$base" archive="$base.tar.xz" tar cJvf "$archive" "$base" else