diff options
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/linux-bionic-5.9.yml | 11 | ||||
| -rw-r--r-- | .github/workflows/mac.yml | 38 |
2 files changed, 34 insertions, 15 deletions
diff --git a/.github/workflows/linux-bionic-5.9.yml b/.github/workflows/linux-bionic-5.9.yml index ac7050632..c0cba7b49 100644 --- a/.github/workflows/linux-bionic-5.9.yml +++ b/.github/workflows/linux-bionic-5.9.yml @@ -29,15 +29,18 @@ jobs: qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools \ qtquickcontrols2-5-dev xvfb - - name: run build + - name: build Subsurface + run: | + cd .. + bash -x subsurface/scripts/build.sh -desktop -build-with-webkit + + - name: test desktop build env: SSRF_USER_EMAIL: ssrftest-u18@hohndel.org SSRF_USER_PASSWORD: ${{ secrets.cloudu18 }} 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 + cd build xvfb-run --auto-servernum make check diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 2c53b329b..72440c24f 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -20,10 +20,7 @@ jobs: mkdir -p Qt/5.13.0 curl --output Qt-5.13.0-mac.tar.xz https://f002.backblazeb2.com/file/Subsurface-Travis/Qt-5.13.0-mac.tar.xz tar -xJ -C Qt/5.13.0 -f Qt-5.13.0-mac.tar.xz - - name: build Subsurface - env: - SSRF_USER_EMAIL: ssrftest-mac@hohndel.org - SSRF_USER_PASSWORD: ${{ secrets.cloudmac }} + - name: build Subsurface-mobile run: | cd ${GITHUB_WORKSPACE}/.. export QT_ROOT=${GITHUB_WORKSPACE}/Qt/5.13.0/clang_64 @@ -35,12 +32,26 @@ jobs: # first build Subsurface-mobile to ensure this didn't get broken bash -e -x ./subsurface/scripts/build.sh -mobile - # run tests + - name: test mobile build + env: + SSRF_USER_EMAIL: ssrftest-mac@hohndel.org + SSRF_USER_PASSWORD: ${{ secrets.cloudmac }} + run: | echo "------------------------------------" echo "run tests for mobile build" - pushd ${GITHUB_WORKSPACE}/build-mobile/tests + export QT_ROOT=${GITHUB_WORKSPACE}/Qt/5.13.0/clang_64 + export QT_QPA_PLATFORM_PLUGIN_PATH=$QT_ROOT/plugins + cd ${GITHUB_WORKSPACE}/build-mobile/tests make check - popd + + - name: build Subsurface + 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) # now Subsurface with WebKit bash -e -x ./subsurface/scripts/build.sh -desktop -build-with-webkit -release @@ -50,12 +61,17 @@ jobs: # build export-html to make sure that didn't get broken make export-html - # run the tests + - name: test desktop build + env: + SSRF_USER_EMAIL: ssrftest-mac@hohndel.org + SSRF_USER_PASSWORD: ${{ secrets.cloudmac }} + run: | echo "------------------------------------" - echo "run tests" - pushd ${GITHUB_WORKSPACE}/build/tests + echo "run tests for desktop build" + export QT_ROOT=${GITHUB_WORKSPACE}/Qt/5.13.0/clang_64 + export QT_QPA_PLATFORM_PLUGIN_PATH=$QT_ROOT/plugins + cd ${GITHUB_WORKSPACE}/build/tests make check - popd - name: package Subsurface run: | |