diff options
| -rw-r--r-- | scripts/android/after_success.sh | 4 | ||||
| -rw-r--r-- | scripts/android/before_install.sh | 8 | ||||
| -rw-r--r-- | scripts/android/travisbuild.sh | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/scripts/android/after_success.sh b/scripts/android/after_success.sh index c79988e06..702cb9660 100644 --- a/scripts/android/after_success.sh +++ b/scripts/android/after_success.sh @@ -8,8 +8,8 @@ fi source ${TRAVIS_BUILD_DIR}/scripts/release-message.sh echo "Submitting the folloing apk for continuous build release:" -ls -lh ../subsurface-mobile-build-arm*/build/outputs/apk/*.apk +ls -lh ../subsurface-mobile-build-docker-arm*/build/outputs/apk/*.apk # get and run the upload script wget -c https://raw.githubusercontent.com/dirkhh/uploadtool/master/upload.sh -bash ./upload.sh ../subsurface-mobile-build-arm*/build/outputs/apk/*.apk +bash ./upload.sh ../subsurface-mobile-build-docker-arm*/build/outputs/apk/*.apk diff --git a/scripts/android/before_install.sh b/scripts/android/before_install.sh index cce934cea..1742a39da 100644 --- a/scripts/android/before_install.sh +++ b/scripts/android/before_install.sh @@ -7,16 +7,16 @@ git pull --tags git describe # setup build dir on the host, not inside of the container -mkdir -p ../subsurface-mobile-build-arm -mkdir -p ../subsurface-mobile-build-arm64 +mkdir -p ../subsurface-mobile-build-docker-arm +mkdir -p ../subsurface-mobile-build-docker-arm64 # this uses a custom built Ubuntu image that includes Qt for Android and # Android NDK/SDK # Running sleep to keep the container running during the build PARENT="$( cd .. && pwd )" docker run -v $PWD:/android/subsurface \ - -v $PARENT/subsurface-mobile-build-arm:/android/subsurface-mobile-build-arm \ - -v $PARENT/subsurface-mobile-build-arm64:/android/subsurface-mobile-build-arm64 \ + -v $PARENT/subsurface-mobile-build-docker-arm:/android/subsurface-mobile-build-arm \ + -v $PARENT/subsurface-mobile-build-docker-arm64:/android/subsurface-mobile-build-arm64 \ --name=android-builder \ -w /android \ -d dirkhh/android-builder:5.12.02 \ diff --git a/scripts/android/travisbuild.sh b/scripts/android/travisbuild.sh index a165922bd..b11aca482 100644 --- a/scripts/android/travisbuild.sh +++ b/scripts/android/travisbuild.sh @@ -8,4 +8,4 @@ set -e # (but of course having the right things in place will save a ton of time) docker exec -e TRAVIS="$TRAVIS" -t android-builder subsurface/packaging/android/android-build-wrapper.sh -ls -l ../subsurface-mobile-build-arm*/build/outputs/apk/ +ls -l ../subsurface-mobile-build-docker-arm*/build/outputs/apk/ |