From 804a5be71f1554d80d742afe3718b7ee26ee786e Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 14 Oct 2019 11:07:42 -0700 Subject: [PATCH] Travis: test mobile build under Linux-Trusty-Qt-5.12 Signed-off-by: Dirk Hohndel --- scripts/linux-trusty-qt512/in-container-build.sh | 4 ++++ scripts/linux-trusty-qt512/travisbuild.sh | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/linux-trusty-qt512/in-container-build.sh b/scripts/linux-trusty-qt512/in-container-build.sh index c8c21bc31..e0b888390 100644 --- a/scripts/linux-trusty-qt512/in-container-build.sh +++ b/scripts/linux-trusty-qt512/in-container-build.sh @@ -9,6 +9,10 @@ set -e export PATH=$QT_ROOT/bin:$PATH # Make sure correct qmake is found on the $PATH for linuxdeployqt export CMAKE_PREFIX_PATH=$QT_ROOT/lib/cmake +# first make sure that no one broke Subsurface-mobile +bash -e -x /subsurface/scripts/build.sh -mobile -quick + +# now build our AppImage bash -e -x /subsurface/scripts/build.sh -desktop -create-appdir -build-with-webkit -quick export QT_PLUGIN_PATH=$QT_ROOT/plugins diff --git a/scripts/linux-trusty-qt512/travisbuild.sh b/scripts/linux-trusty-qt512/travisbuild.sh index 91981108e..1a5c3c470 100644 --- a/scripts/linux-trusty-qt512/travisbuild.sh +++ b/scripts/linux-trusty-qt512/travisbuild.sh @@ -8,6 +8,9 @@ set -e docker exec -t trusty-qt512 bash subsurface/scripts/linux-trusty-qt512/in-container-build.sh 2>&1 | tee build.log -# fail the build if we didn't create the target binary +# fail the build if we didn't create Subsurface-mobile +grep "Built target subsurface-mobile" build.log + +# fail the build if we didn't create the AppImage grep "Please consider submitting your AppImage to AppImageHub" build.log