diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-01-01 10:52:53 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-01-01 15:11:20 -0800 |
| commit | 5584574062eafdd99deca63689b30a5fa977e999 (patch) | |
| tree | 999778c137dd102f4b8a4e12cfca6bf33c56f663 /.github/workflows/mac.yml | |
| parent | 06de2a91ce80ae2af10d82ee9c63f4141aca50b6 (diff) | |
| download | subsurface-5584574062eafdd99deca63689b30a5fa977e999.tar.gz | |
GitHub Actions: better grouping of test steps
This is a bit more convoluted to do inside of the Ubuntu 19.10 container, but
at least for Ubuntu 14.04 and for Mac this will be an improvement.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to '.github/workflows/mac.yml')
| -rw-r--r-- | .github/workflows/mac.yml | 38 |
1 files changed, 27 insertions, 11 deletions
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: | |