diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2018-12-29 09:01:06 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-12-30 11:20:34 -0800 |
| commit | 63498df1bc614bf95bd0cce4e7a10e872f63623b (patch) | |
| tree | 3bed5b541d20f6b208b9e1db4e3384b002766787 | |
| parent | 1e1457318c74dcb3b5b7dfc84cc2002c04214879 (diff) | |
| download | subsurface-63498df1bc614bf95bd0cce4e7a10e872f63623b.tar.gz | |
Android Docker: give the docker build its own output tree
Again, this is relevant for developers that do local docker android
builds, and normal android builds. A normal build uses the directory
subsurface-mobile-build-arm(64), and when doing a docker android build
this directory is shared between host and container. That sharing is
good, as it nicely exposes the build tree to the host (for easy compare,
inspection, etc.). But reusing the same tree as the local one is
inconvenient (and possibly dangerous due to all kinds of caching
issues).
So, give the docker build its own output tree for the shared
subsurface-mobile-build-arm(64) build output.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
| -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/ |