From 8fa9eabb47f451e60af765f007cca2af6def5222 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 11 Jul 2018 12:29:23 -0700 Subject: [PATCH] Travis: add Qt 5.7 testing This is done via Fedora 26 which seemed the easiest way to get a 5.7 based distro. Signed-off-by: Dirk Hohndel --- .travis.yml | 7 +++++++ scripts/qt57/after_success.sh | 3 +++ scripts/qt57/before_install.sh | 20 ++++++++++++++++++++ scripts/qt57/travisbuild.sh | 9 +++++++++ 4 files changed, 39 insertions(+) create mode 100644 scripts/qt57/after_success.sh create mode 100644 scripts/qt57/before_install.sh create mode 100644 scripts/qt57/travisbuild.sh diff --git a/.travis.yml b/.travis.yml index 75469cafd..5f77f0182 100644 --- a/.travis.yml +++ b/.travis.yml @@ -125,6 +125,13 @@ matrix: services: - docker + - env: SUBSURFACE_PLATFORM="qt57" + os: linux + language: c++ + filter_secrets: false + services: + - docker + before_install: - source ${TRAVIS_BUILD_DIR}/scripts/${SUBSURFACE_PLATFORM}/before_install.sh diff --git a/scripts/qt57/after_success.sh b/scripts/qt57/after_success.sh new file mode 100644 index 000000000..f6e0fe78c --- /dev/null +++ b/scripts/qt57/after_success.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +echo "Build with Qt 5.7 succeeded" diff --git a/scripts/qt57/before_install.sh b/scripts/qt57/before_install.sh new file mode 100644 index 000000000..6abec0036 --- /dev/null +++ b/scripts/qt57/before_install.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +# Travis only pulls shallow repos. But that messes with git describe. +# Sorry Travis, fetching the whole thing and the tags as well... +git fetch --unshallow +git pull --tags +git describe + +# Ugly, but keeps it running during the build +docker run -v $PWD:/workspace/subsurface --name=builder -w /workspace -d fedora:26 /bin/sleep 60m + +# Subsurface build dependencies +docker exec -t builder zypper refresh +docker exec -t builder dnf install -y \ + git gcc-c++ make autoconf automake libtool cmake bzip2-devel \ + libzip-devel libxml2-devel libxslt-devel libsqlite3x-devel \ + 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 diff --git a/scripts/qt57/travisbuild.sh b/scripts/qt57/travisbuild.sh new file mode 100644 index 000000000..060d36d46 --- /dev/null +++ b/scripts/qt57/travisbuild.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +set -x +set -e + +docker exec -t builder subsurface/scripts/build.sh -desktop 2>&1 | tee build.log +# fail the build if we didn't create the target binary +grep /workspace/install-root/bin/subsurface build.log +