summaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2019-12-27 11:21:09 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-12-30 17:41:07 -0800
commitf788311b298abd4190e2ae98204171d8e05d11d8 (patch)
tree7a66224b81bcc95360dec5a27fff01a1e2e2ce9c /.github
parentc2ccbe1f63769446cb15a3f3ef49d688dc04b646 (diff)
downloadsubsurface-f788311b298abd4190e2ae98204171d8e05d11d8.tar.gz
GitHub Actions: run the tests on Mac and Ubuntu 18.04/Qt 5.9 desktop
We lost running the tests when migrating to GitHub Actions... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/linux-bionic-5.9.yml7
-rw-r--r--.github/workflows/mac.yml15
2 files changed, 21 insertions, 1 deletions
diff --git a/.github/workflows/linux-bionic-5.9.yml b/.github/workflows/linux-bionic-5.9.yml
index d82a9b3ad..a1710ffbb 100644
--- a/.github/workflows/linux-bionic-5.9.yml
+++ b/.github/workflows/linux-bionic-5.9.yml
@@ -27,9 +27,14 @@ jobs:
qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \
qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \
- qtquickcontrols2-5-dev
+ qtquickcontrols2-5-dev xvfb
- name: run build
run: |
cd ..
bash -x subsurface/scripts/build.sh -desktop -build-with-webkit
+ # and now run the tests - with Qt 5.9 we can only run the desktop flavor
+ echo "------------------------------------"
+ echo "run tests"
+ cd subsurface/build
+ xvfb-run --auto-servernum make check
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 909babfef..ec0af35e7 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -24,6 +24,7 @@ jobs:
run: |
cd ${GITHUB_WORKSPACE}/..
export QT_ROOT=${GITHUB_WORKSPACE}/Qt/5.13.0/clang_64
+ export QT_QPA_PLATFORM_PLUGIN_PATH=$QT_ROOT/plugins
export PATH=$QT_ROOT/bin:$PATH
export CMAKE_PREFIX_PATH=$QT_ROOT/lib/cmake
DIR=$(pwd)
@@ -31,6 +32,13 @@ jobs:
# first build Subsurface-mobile to ensure this didn't get broken
bash -e -x ./subsurface/scripts/build.sh -mobile
+ # run tests
+ echo "------------------------------------"
+ echo "run tests for mobile build"
+ pushd ${GITHUB_WORKSPACE}/build-mobile/tests
+ make check
+ popd
+
# now Subsurface with WebKit
bash -e -x ./subsurface/scripts/build.sh -desktop -build-with-webkit -release
@@ -39,6 +47,13 @@ jobs:
# build export-html to make sure that didn't get broken
make export-html
+ # run the tests
+ echo "------------------------------------"
+ echo "run tests"
+ pushd ${GITHUB_WORKSPACE}/build/tests
+ make check
+ popd
+
- name: package Subsurface
run: |
cd ${GITHUB_WORKSPACE}/build