GitHub Actions: execute the Ubuntu 19.10 steps in yaml

This way we can also easily name them as we did for the other two tested
platforms.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-01-01 11:22:48 -08:00
parent 5584574062
commit 30b123bd44
2 changed files with 54 additions and 52 deletions

View file

@ -17,11 +17,62 @@ jobs:
- name: checkout sources - name: checkout sources
uses: actions/checkout@v1 uses: actions/checkout@v1
- name: run build - name: get container ready for build
env: env:
SSRF_USER_EMAIL: ssrftest-u19@hohndel.org SSRF_USER_EMAIL: ssrftest-u19@hohndel.org
SSRF_USER_PASSWORD: ${{ secrets.cloudu19 }} SSRF_USER_PASSWORD: ${{ secrets.cloudu19 }}
run: | run: |
cd .. echo "--------------------------------------------------------------"
bash -x subsurface/.github/workflows/scripts/ubuntu-in-container-build.sh 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-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 xvfb
- name: build Subsurface-mobile
run: |
echo "--------------------------------------------------------------"
echo "building mobile"
cd ..
bash -e -x subsurface/scripts/build.sh -mobile
- name: test mobile build
env:
SSRF_USER_EMAIL: ssrftest-u19@hohndel.org
SSRF_USER_PASSWORD: ${{ secrets.cloudu19 }}
run: |
echo "--------------------------------------------------------------"
echo "running tests for mobile"
cd build-mobile
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
env:
SSRF_USER_EMAIL: ssrftest-u19@hohndel.org
SSRF_USER_PASSWORD: ${{ secrets.cloudu19 }}
run: |
echo "--------------------------------------------------------------"
echo "running tests for desktop"
cd build
xvfb-run --auto-servernum make check

View file

@ -1,49 +0,0 @@
#!/bin/bash
# this is used to do a standard build of Subsurface (including tests) in a "random"
# Ubuntu container (I assume we will keep moving this to the latest Ubuntu)
set -x
set -e
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-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 xvfb
echo "--------------------------------------------------------------"
echo "building mobile"
# first make sure that no one broke Subsurface-mobile
bash -e -x subsurface/scripts/build.sh -mobile
echo "--------------------------------------------------------------"
echo "running tests for mobile"
pushd subsurface/build-mobile
xvfb-run --auto-servernum make check
popd
echo "--------------------------------------------------------------"
echo "building desktop"
# now build for the desktop version (including WebKit)
bash -e -x subsurface/scripts/build.sh -desktop -build-with-webkit
echo "--------------------------------------------------------------"
echo "running tests for desktop"
pushd subsurface/build
xvfb-run --auto-servernum make check
popd