mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

build-system: tell Travis to wait longer for downloads

Browse source 
But simply ignore when building outside of Travis.
Of course since we are building Android in a container, we need to first pass
the environment variable to the container...

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-07-02 14:14:29 -07:00
parent 0661c74880
commit d6b043cd37
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packaging/android/android-build-wrapper.sh
View file

@ -13,7 +13,13 @@
# Qt/5.9/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake # Qt/5.9/android_armv7/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake
# (this script tries to do this automatically) # (this script tries to do this automatically)
set -x # make debugging Travis easier # avoid timeouts on Travis when downloads take a long time
SLOW_PROG=""
if [ -n "${TRAVIS:-}" ]; then
source subsurface/scripts/travis-wait.sh
set -x # make debugging Travis easier
SLOW_PROG="travis_wait"
fi
exec 1> >(tee ./build.log) 2>&1 exec 1> >(tee ./build.log) 2>&1
@ -65,14 +71,14 @@ fi
# first we need to get the Android SDK and NDK # first we need to get the Android SDK and NDK
if [ ! -d $ANDROID_NDK ] ; then if [ ! -d $ANDROID_NDK ] ; then
if [ ! -f $NDK_BINARIES ] ; then if [ ! -f $NDK_BINARIES ] ; then
wget -q https://dl.google.com/android/repository/$NDK_BINARIES $SLOW_PROG wget -q https://dl.google.com/android/repository/$NDK_BINARIES
fi fi
unzip -q $NDK_BINARIES unzip -q $NDK_BINARIES
fi fi
if [ ! -d $ANDROID_SDK ] ; then if [ ! -d $ANDROID_SDK ] ; then
if [ ! -f $SDK_TOOLS ] ; then if [ ! -f $SDK_TOOLS ] ; then
wget -q https://dl.google.com/android/repository/$SDK_TOOLS $SLOW_PROG wget -q https://dl.google.com/android/repository/$SDK_TOOLS
fi fi
mkdir $ANDROID_SDK mkdir $ANDROID_SDK
pushd $ANDROID_SDK pushd $ANDROID_SDK
@ -89,7 +95,7 @@ fi
QT_DOWNLOAD_URL=https://download.qt.io/archive/qt/${QT_VERSION}/${LATEST_QT}/${QT_BINARIES} QT_DOWNLOAD_URL=https://download.qt.io/archive/qt/${QT_VERSION}/${LATEST_QT}/${QT_BINARIES}
if [ ! -d Qt ] ; then if [ ! -d Qt ] ; then
if [ ! -f ${QT_BINARIES} ] ; then if [ ! -f ${QT_BINARIES} ] ; then
wget -q ${QT_DOWNLOAD_URL} $SLOW_PROG wget -q ${QT_DOWNLOAD_URL}
fi fi
chmod +x ./${QT_BINARIES} chmod +x ./${QT_BINARIES}
./${QT_BINARIES} --platform minimal --script "$SUBSURFACE_SOURCE"/qt-installer-noninteractive.qs --no-force-installations ./${QT_BINARIES} --platform minimal --script "$SUBSURFACE_SOURCE"/qt-installer-noninteractive.qs --no-force-installations

2
scripts/android/travisbuild.sh
View file

@ -3,7 +3,7 @@
set -x set -x
set -e set -e
docker exec -t builder subsurface/packaging/android/android-build-wrapper.sh docker exec -e TRAVIS="$TRAVIS" -t builder subsurface/packaging/android/android-build-wrapper.sh
# Extract the built apk from the builder container # Extract the built apk from the builder container
docker cp builder:/workspace/subsurface-mobile-build-arm/build/outputs/apk/ . docker cp builder:/workspace/subsurface-mobile-build-arm/build/outputs/apk/ .