diff options
| author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2022-01-01 20:41:04 +0100 |
|---|---|---|
| committer | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2022-01-01 20:46:53 +0100 |
| commit | bbaaab6590e5435fd9c967ca4af5ef06d9182698 (patch) | |
| tree | 9bb1d019a101ec1645c214d48c9524bdbdee6342 /.github/workflows/ci.yml | |
| parent | 27bb7ba696ae803c6a6903f85fe14074b23b7bcc (diff) | |
| download | libquotient-bbaaab6590e5435fd9c967ca4af5ef06d9182698.tar.gz libquotient-bbaaab6590e5435fd9c967ca4af5ef06d9182698.zip | |
BUILD_SHARED_LIBS in most jobs; fix not finding libQuotient.so.*
Diffstat (limited to '.github/workflows/ci.yml')
| -rw-r--r-- | .github/workflows/ci.yml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e4bf8e29..d4af9b30 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,10 +105,10 @@ jobs: fi echo "QUOTEST_ORIGIN=$VERSION @ ${{ runner.os }}/${{ matrix.compiler }}" >>$GITHUB_ENV - # Build libQuotient as a shared library for the sonar-enabled run - # to have this configuration also covered + # 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=${{ matrix.sonar }} \ + -DBUILD_SHARED_LIBS=${{ !matrix.sonar }} \ -DCMAKE_INSTALL_PREFIX=~/.local \ -DCMAKE_PREFIX_PATH=~/.local \ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON" @@ -122,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 @@ -205,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 |