diff options
| author | Pierre Grandin <grandinp@gmail.com> | 2017-09-01 12:45:39 -0700 |
|---|---|---|
| committer | Pierre Grandin <grandinp@gmail.com> | 2017-09-01 12:45:39 -0700 |
| commit | 533c82559b97b399f2f739734ec0767fdd1c7aea (patch) | |
| tree | d565c3dcc7d7ec6d413ced871794a0d692269860 | |
| parent | fe70e18d038af4fae4fc6f98bd135feb34c75c52 (diff) | |
| download | navit-533c82559b97b399f2f739734ec0767fdd1c7aea.tar.gz | |
Fixed apk path for ci_v2
| -rw-r--r-- | ci/build_android_x86.sh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh index bef6dbcfa..6e84bc4e1 100644 --- a/ci/build_android_x86.sh +++ b/ci/build_android_x86.sh @@ -31,14 +31,11 @@ cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/i686-android.cmake -DAVOID_FLOAT=1 -DS make -j $(nproc --all) if [[ "${CIRCLE_BRANCH}" == "master" ]]; then - make -j $(nproc --all) apkg-release && mv $BUILD_PATH/navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit 1 + 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 $BUILD_PATH/navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-debug.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 fi -[ -d $CIRCLE_ARTIFACTS/android-${ARCH}/ ] || mkdir $CIRCLE_ARTIFACTS/android-${ARCH}/ -cp $BUILD_PATH/navit/*.xml $CIRCLE_ARTIFACTS/android-${ARCH}/ - echo echo "Build leftovers :" -ls $BUILD_PATH +find . |