From 5aa9a64c4de416c49c00f18028b2f0f9eb1e01b7 Mon Sep 17 00:00:00 2001 From: Alexey Rusakov Date: Sun, 24 Sep 2023 12:15:31 +0200 Subject: [PATCH] CI: Fix OpenSSL usage on Windows 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. --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22c23a77..6acd2aa0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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) @@ -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