From 33643bb0af0729f79b28cc0398d6990a6537f810 Mon Sep 17 00:00:00 2001 From: Christof Arnosti Date: Thu, 5 Mar 2020 22:36:57 +0100 Subject: 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 Signed-off-by: Dirk Hohndel --- scripts/android/before_install.sh | 2 +- scripts/android/travisbuild.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/android') 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 -- cgit v1.2.3-70-g09d2