summaryrefslogtreecommitdiffstats
path: root/.github/workflows
diff options
context:
space:
mode:
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/linux-focal-5.12.yml2
-rw-r--r--.github/workflows/linux-groovy-5.14.yml2
-rw-r--r--.github/workflows/linux-hirsute-5.15.yml72
3 files changed, 74 insertions, 2 deletions
diff --git a/.github/workflows/linux-focal-5.12.yml b/.github/workflows/linux-focal-5.12.yml
index 612e18ebf..e96828b19 100644
--- a/.github/workflows/linux-focal-5.12.yml
+++ b/.github/workflows/linux-focal-5.12.yml
@@ -30,7 +30,7 @@ jobs:
libqt5webkit5-dev libsqlite3-dev libssh2-1-dev libssl-dev libssl-dev \
libtool libusb-1.0-0-dev libxml2-dev libxslt1-dev libzip-dev make \
pkg-config qml-module-qtlocation qml-module-qtpositioning \
- qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \
+ qml-module-qtquick2 qt5-qmake qtchooser qtconnectivity5-dev \
qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \
qtquickcontrols2-5-dev xvfb libbluetooth-dev libmtp-dev
diff --git a/.github/workflows/linux-groovy-5.14.yml b/.github/workflows/linux-groovy-5.14.yml
index 3f1c947ff..17a0ea8d5 100644
--- a/.github/workflows/linux-groovy-5.14.yml
+++ b/.github/workflows/linux-groovy-5.14.yml
@@ -30,7 +30,7 @@ jobs:
libqt5webkit5-dev libsqlite3-dev libssh2-1-dev libssl-dev libssl-dev \
libtool libusb-1.0-0-dev libxml2-dev libxslt1-dev libzip-dev make \
pkg-config qml-module-qtlocation qml-module-qtpositioning \
- qml-module-qtquick2 qt5-default qt5-qmake qtchooser qtconnectivity5-dev \
+ qml-module-qtquick2 qt5-qmake qtchooser qtconnectivity5-dev \
qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \
qtquickcontrols2-5-dev xvfb libbluetooth-dev libmtp-dev
diff --git a/.github/workflows/linux-hirsute-5.15.yml b/.github/workflows/linux-hirsute-5.15.yml
new file mode 100644
index 000000000..bebc478ca
--- /dev/null
+++ b/.github/workflows/linux-hirsute-5.15.yml
@@ -0,0 +1,72 @@
+name: Ubuntu 21.04 / Qt 5.15--
+on:
+ push:
+ branches:
+ - master
+ pull_request:
+ branches:
+ - master
+
+jobs:
+ buildUbuntuHirsute:
+ runs-on: ubuntu-latest
+ container:
+ image: ubuntu:21.04
+
+ steps:
+ - name: checkout sources
+ uses: actions/checkout@v1
+
+ - name: get container ready for build
+ run: |
+ echo "--------------------------------------------------------------"
+ echo "update distro and install dependencies"
+
+ apt-get update
+ apt-get upgrade -y
+ DEBIAN_FRONTEND=noninteractive apt-get install -y -q --force-yes \
+ autoconf automake cmake g++ git libcrypto++-dev libcurl4-gnutls-dev \
+ libgit2-dev libqt5qml5 libqt5quick5 libqt5svg5-dev \
+ libqt5webkit5-dev libsqlite3-dev libssh2-1-dev libssl-dev libssl-dev \
+ libtool libusb-1.0-0-dev libxml2-dev libxslt1-dev libzip-dev make \
+ pkg-config qml-module-qtlocation qml-module-qtpositioning \
+ qml-module-qtquick2 qt5-qmake qtchooser qtconnectivity5-dev \
+ qtdeclarative5-dev qtdeclarative5-private-dev qtlocation5-dev \
+ qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \
+ qtquickcontrols2-5-dev xvfb libbluetooth-dev libmtp-dev
+
+ - name: build Subsurface-mobile
+ run: |
+ echo "--------------------------------------------------------------"
+ echo "building mobile"
+ git config --global user.email "ci@subsurface-divelog.org"
+ git config --global user.name "Subsurface CI"
+ cd ..
+ bash -e -x subsurface/scripts/build.sh -mobile
+
+ - name: test mobile build
+ run: |
+ echo "--------------------------------------------------------------"
+ echo "running tests for mobile"
+
+ cd build-mobile/tests
+ # xvfb-run --auto-servernum ./TestGitStorage -v2
+ xvfb-run --auto-servernum make check
+
+ - name: build Subsurface
+ run: |
+ echo "--------------------------------------------------------------"
+ echo "building desktop"
+
+ # now build for the desktop version (including WebKit)
+ cd ..
+ bash -e -x subsurface/scripts/build.sh -desktop -build-with-webkit
+
+ - name: test desktop build
+ run: |
+ echo "--------------------------------------------------------------"
+ echo "running tests for desktop"
+ cd build/tests
+ # xvfb-run --auto-servernum ./TestGitStorage -v2
+ xvfb-run --auto-servernum make check
+