summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2018-10-08 15:40:10 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-10-09 10:03:38 -0700
commit7a1ceee4e791d8fcc44b571b7453d2ebb2308388 (patch)
tree9d5fee2885cfd1e0ec46a1daf005f06bee64dfa3
parent4a0beab2a4d8511eb4226e52fd840d466eb97bb2 (diff)
downloadsubsurface-7a1ceee4e791d8fcc44b571b7453d2ebb2308388.tar.gz
Travis: build Subsurface-mobile against Qt57 as well
Simply adding another OS / environment on which we test building of Subsurface-mobile Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--scripts/qt57/before_install.sh4
-rw-r--r--scripts/qt57/travisbuild.sh3
2 files changed, 5 insertions, 2 deletions
diff --git a/scripts/qt57/before_install.sh b/scripts/qt57/before_install.sh
index 6abec0036..c064dad6a 100644
--- a/scripts/qt57/before_install.sh
+++ b/scripts/qt57/before_install.sh
@@ -17,4 +17,6 @@ docker exec -t builder dnf install -y \
libudev-devel libusbx-devel libcurl-devel libssh2-devel\
qt5-qtbase-devel qt5-qtdeclarative-devel qt5-qtscript-devel \
qt5-qtwebkit-devel qt5-qtsvg-devel qt5-qttools-devel \
- qt5-qtconnectivity-devel qt5-qtlocation-devel
+ qt5-qtconnectivity-devel qt5-qtlocation-devel \
+ which redhat-rpm-config patch qt5-qtquickcontrols \
+ qt5-qtquickcontrols2-devel
diff --git a/scripts/qt57/travisbuild.sh b/scripts/qt57/travisbuild.sh
index 060d36d46..cd4efdc20 100644
--- a/scripts/qt57/travisbuild.sh
+++ b/scripts/qt57/travisbuild.sh
@@ -3,7 +3,8 @@
set -x
set -e
-docker exec -t builder subsurface/scripts/build.sh -desktop 2>&1 | tee build.log
+docker exec -t builder subsurface/scripts/build.sh -both 2>&1 | tee build.log
# fail the build if we didn't create the target binary
grep /workspace/install-root/bin/subsurface build.log
+grep /workspace/install-root/bin/subsurface-mobile build.log