diff options
| author | Hnatiuk Vladyslav <aders1234@gmail.com> | 2022-01-02 11:27:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-02 11:27:33 +0100 |
| commit | 8730fb0782860f278760e369b9f42f266f0572b3 (patch) | |
| tree | ea6b22c418e20a03282483bd599aa79db2e2e6cc /.github | |
| parent | ca6a104941b71e7b6a8bdcb6ebcdfff5ec8e8aca (diff) | |
| parent | d516280a2b38ccb060e4f7502b873e19b1559ed1 (diff) | |
| download | libquotient-8730fb0782860f278760e369b9f42f266f0572b3.tar.gz libquotient-8730fb0782860f278760e369b9f42f266f0572b3.zip | |
Merge branch 'quotient-im:dev' into fix-qt-6
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/ci.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e56ea26e..35a5c6f9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,8 +105,10 @@ jobs: fi echo "QUOTEST_ORIGIN=$VERSION @ ${{ runner.os }}/${{ matrix.compiler }}" >>$GITHUB_ENV + # Build libQuotient as a shared library across platforms but also + # check the static configuration somewhere CMAKE_ARGS="-G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DBUILD_SHARED_LIBS=false \ + -DBUILD_SHARED_LIBS=${{ !matrix.sonar && runner.os == 'Linux' }} \ -DCMAKE_INSTALL_PREFIX=~/.local \ -DCMAKE_PREFIX_PATH=~/.local \ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON" @@ -120,6 +122,7 @@ jobs: if [[ '${{ runner.os }}' != 'Windows' ]]; then BIN_DIR=/bin + echo "LIB_PATH=$HOME/.local/lib" >>$GITHUB_ENV fi echo "BIN_DIR=$BIN_DIR" >>$GITHUB_ENV echo "~/.local$BIN_DIR" >>$GITHUB_PATH @@ -203,6 +206,7 @@ jobs: run: | ctest --test-dir $BUILD_PATH --output-on-failure [[ -z "$TEST_USER" ]] || \ + LD_LIBRARY_PATH=$LIB_PATH \ $VALGRIND quotest "$TEST_USER" "$TEST_PWD" quotest-gha '#quotest:matrix.org' "$QUOTEST_ORIGIN" timeout-minutes: 4 # quotest is supposed to finish within 3 minutes, actually |