diff options
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/ci.yml | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35a5c6f9..0bbbc06c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,18 +19,22 @@ jobs: fail-fast: false max-parallel: 1 matrix: - os: [ubuntu-20.04, macos-10.15] + os: [ ubuntu-20.04, macos-10.15 ] compiler: [ GCC, Clang ] qt-version: [ '5.12.12' ] # Not using binary values here, to make the job captions more readable - e2ee: [ '' ] - update-api: [ '', 'update-api' ] + e2ee: [ '', e2ee ] + update-api: [ '', update-api ] sonar: [ '' ] platform: [ '' ] qt-arch: [ '' ] exclude: - os: macos-10.15 compiler: GCC + - os: windows-2019 + e2ee: e2ee # Not supported by the current CI script + - os: macos-10.15 + e2ee: e2ee # Missing OpenSSL include: - os: ubuntu-latest compiler: GCC @@ -55,7 +59,6 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 - submodules: ${{ matrix.e2ee != '' }} - name: Cache Qt id: cache-qt @@ -150,6 +153,11 @@ jobs: unzip -o sonar-scanner-cli*.zip popd + - name: Install OpenSSL + if: ${{ contains(matrix.os, 'ubuntu') && matrix.e2ee }} + run: | + sudo apt-get install libssl-dev + - name: Build and install olm if: matrix.e2ee working-directory: ${{ runner.workspace }} @@ -159,6 +167,13 @@ jobs: cmake --build build/olm --target install echo "QUOTEST_ORIGIN=$QUOTEST_ORIGIN with E2EE" >>$GITHUB_ENV + - name: Build and install QtKeychain + run: | + cd .. + git clone https://github.com/frankosterfeld/qtkeychain.git + cmake -S qtkeychain -B qtkeychain/build $CMAKE_ARGS + cmake --build qtkeychain/build --target install + - name: Pull CS API and build GTAD if: matrix.update-api working-directory: ${{ runner.workspace }} @@ -204,7 +219,12 @@ jobs: QT_LOGGING_RULES: 'quotient.main.debug=true;quotient.jobs.debug=true;quotient.events.debug=true' QT_MESSAGE_PATTERN: '%{time h:mm:ss.zzz}|%{category}|%{if-debug}D%{endif}%{if-info}I%{endif}%{if-warning}W%{endif}%{if-critical}C%{endif}%{if-fatal}F%{endif}|%{message}' run: | - ctest --test-dir $BUILD_PATH --output-on-failure + CTEST_ARGS="--test-dir $BUILD_PATH --output-on-failure" + if [[ -z '${{ matrix.e2ee }}' || '${{ runner.os }}' != 'Linux' ]]; then + ctest $CTEST_ARGS -E testolmaccount + else + autotests/run-tests.sh $CTEST_ARGS + fi [[ -z "$TEST_USER" ]] || \ LD_LIBRARY_PATH=$LIB_PATH \ $VALGRIND quotest "$TEST_USER" "$TEST_PWD" quotest-gha '#quotest:matrix.org' "$QUOTEST_ORIGIN" |