summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre GRANDIN <pgrandin@users.noreply.github.com>2017-11-04 10:42:59 -0700
committerGitHub <noreply@github.com>2017-11-04 10:42:59 -0700
commita1671c7f85bba03f4ab510c325123bf267273315 (patch)
treef3c76725548d7d87c5bb333a762e0a2b9b8dab48
parent7004ae68f90c49f82d24dbff4dab5b14419317fa (diff)
downloadnavit-a1671c7f85bba03f4ab510c325123bf267273315.tar.gz
change:android:always build apk release (#364)
-rw-r--r--ci/build_android.sh11
1 files changed, 2 insertions, 9 deletions
diff --git a/ci/build_android.sh b/ci/build_android.sh
index ad42c78c2..bf992fd2c 100644
--- a/ci/build_android.sh
+++ b/ci/build_android.sh
@@ -30,12 +30,5 @@ cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/arm-eabi.cmake -DCACHE_SIZE='(20*1024*
make -j $(nproc --all)
-if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
- make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit 1
-else
- make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit 1
-fi
-
-echo
-echo "Build leftovers :"
-find .
+make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit 1
+make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit 1