summaryrefslogtreecommitdiffstats
path: root/scripts/linux
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2018-05-19 15:07:44 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-05-19 21:21:46 -0700
commit14d18276e4c7f9f027b4041d73446d41bae6df67 (patch)
tree7e87070e3fc13fc807b0c3bc5e9334ad1c641d0c /scripts/linux
parent1faa5d7ae19babcab3c8f4214292110964d14a6d (diff)
downloadsubsurface-14d18276e4c7f9f027b4041d73446d41bae6df67.tar.gz
Travis: add secondary Linux build target
The goal is to reduce the overall wall clock time of our test builds. This secondary Linux target uses the no-sudo container setup with a Qt 5.10.1 backport and tests the build without BT support as well as the mobile build (but not the full desktop build and doesn't create an AppImage as the pre-built Qt5.10.1 is missing QtWebKit). In exchange we remove the no-bt and mobile build from the existing linux target. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts/linux')
-rw-r--r--scripts/linux/travisbuild.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/linux/travisbuild.sh b/scripts/linux/travisbuild.sh
index f4bfaf63f..f87ef7f76 100644
--- a/scripts/linux/travisbuild.sh
+++ b/scripts/linux/travisbuild.sh
@@ -15,9 +15,7 @@ export CMAKE_PREFIX_PATH=$QT_ROOT/lib/cmake
# to create an AppImage
cd ..
-bash -e -x ./subsurface/scripts/build.sh -desktop -no-bt
-rm -rf subsurface/build
-bash -e -x ./subsurface/scripts/build.sh -both -create-appdir -build-with-webkit
+bash -e -x ./subsurface/scripts/build.sh -desktop -create-appdir -build-with-webkit
export QT_PLUGIN_PATH=$QT_ROOT/plugins
export QT_QPA_PLATFORM_PLUGIN_PATH=$QT_ROOT/plugins