diff options
| author |  Christof Arnosti <charno@charno.ch> | 2020-03-05 22:36:57 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-03-07 12:34:43 -0800 |
| commit | 33643bb0af0729f79b28cc0398d6990a6537f810 (patch) | |
| tree | 3371208ee25bd9fc365fd3f0bdaa947263a904af | |
| parent | e6158c55e188ddd417f72e1140e291f8d89c166b (diff) | |
| download | subsurface-33643bb0af0729f79b28cc0398d6990a6537f810.tar.gz | |
travis build-scripts: update container
While the project doesn't use Travis anymore, these scripts are indeed
useful when building locally, so it makes sense to keep them current and
working.
Signed-off-by: Christof Arnosti <charno@charno.ch>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | scripts/android/before_install.sh | 2 | ||||
| -rw-r--r-- | scripts/android/travisbuild.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/android/before_install.sh b/scripts/android/before_install.sh index c9638a362..42a3bb1d1 100644 --- a/scripts/android/before_install.sh +++ b/scripts/android/before_install.sh @@ -19,5 +19,5 @@ docker run -v $PWD:/android/subsurface \ -v $PARENT/subsurface-mobile-build-docker-arm64:/android/subsurface-mobile-build-arm64 \ --name=android-builder \ -w /android \ - -d dirkhh/android-builder:5.12.04.1 \ + -d subsurface/android-build-container:5.13.10 \ /bin/sleep 60m diff --git a/scripts/android/travisbuild.sh b/scripts/android/travisbuild.sh index b7fe5fa8d..b06171fbc 100644 --- a/scripts/android/travisbuild.sh +++ b/scripts/android/travisbuild.sh @@ -6,6 +6,6 @@ set -e # by running the build wrapper again we should be able to test newer # versions of the dependencies even without updating the docker image # (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 +docker exec -e TRAVIS="$TRAVIS" -t android-builder sh -c "ln -s /android/Qt . ; ln -s /android/android-ndk-r18b . ; ln -s /android/android-sdk-linux . ; subsurface/packaging/android/android-build-wrapper.sh" ls -l ../subsurface-mobile-build-docker-arm*/build/outputs/apk/debug |