Skip to content

Commit

Permalink
CI: Fix OpenSSL usage on Windows
Browse files Browse the repository at this point in the history
Some undocumented change in the most recent Windows runner (or in a Qt
build - no idea) led to CMake getting misled and trying to use
an incomplete OpenSSL installation coming with Qt even when
tools_openssl is not chosen in aqtinstall. Given that it's always better
to use the same version of OpenSSL as that used by Qt, tools_openssl
is now actually installed on Windows.
  • Loading branch information
KitsuneRal committed Sep 24, 2023
1 parent dacf783 commit 5aa9a64
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
cache: true
cache-key-prefix: Qt
modules: ${{ matrix.qt-version == 6 && 'qtmultimedia' || '' }}
tools: tools_ninja
tools: "tools_ninja${{ startsWith(matrix.os, 'windows') && ' tools_openssl_x64' || '' }}"

# Install on Linux via apt to get Qt built with OpenSSL 3
- name: Install Qt (Linux)
Expand All @@ -118,7 +118,8 @@ jobs:
${{ runner.os != 'Linux' && '-DCMAKE_MAKE_PROGRAM=$IQTA_TOOLS/Ninja/ninja' || '' }} \
-DCMAKE_PREFIX_PATH=~/.local \
-DQuotient_ENABLE_E2EE=ON \
${{ runner.os == 'macOS' && '-DOPENSSL_ROOT_DIR=`brew --prefix openssl`' || '' }} \
${{ runner.os == 'macOS' && '-DOPENSSL_ROOT_DIR=`brew --prefix openssl`' ||
runner.os == 'Windows' && '-DOPENSSL_ROOT_DIR=$IQTA_TOOLS/OpenSSL/*/' || '' }} \
-DBUILD_SHARED_LIBS=${{ matrix.composition == 'dynamic' }} \
-DBUILD_WITH_QT6=${{ matrix.qt-version == 6 }}" \
>>$GITHUB_ENV
Expand Down

0 comments on commit 5aa9a64

Please sign in to comment.