From e17ff208e03f0bf840042490ec8f54b53a15e0b3 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Wed, 6 Mar 2024 14:55:22 -0800 Subject: [PATCH] Qt apparently doesn't distribute OpenSSL 1.1 binaries any more --- .github/workflows/win-ci.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/win-ci.yml b/.github/workflows/win-ci.yml index dd1edef..3719b75 100644 --- a/.github/workflows/win-ci.yml +++ b/.github/workflows/win-ci.yml @@ -14,7 +14,6 @@ jobs: - kf_version: "5.115" kf_fullver: "5.115.0" qt_version: "5.15.2" - qt_tools: "tools_openssl_x64" cmake_generator: "Visual Studio 16 2019" kf_cmake_args: "" build_installer: "$false" @@ -22,7 +21,6 @@ jobs: - kf_version: "6.0" kf_fullver: "6.0.0" qt_version: "6.5.3" - qt_tools: "" cmake_generator: "Visual Studio 16 2019" kf_cmake_args: "-DBUILD_WITH_QT6=ON" build_installer: "$true" @@ -37,7 +35,6 @@ jobs: with: arch: win64_msvc2019_64 version: ${{ matrix.cfg.qt_version }} - tools: ${{ matrix.cfg.qt_tools }} - name: Build Qt Libs run: | mkdir build_deps @@ -90,8 +87,8 @@ jobs: # OpenSSL libs are required for the online repository update in Qt5, # but Qt6 can use the Windows SChannel backend instead if (${{ matrix.cfg.deploy_openssl }}) { - copy "${Env:RUNNER_WORKSPACE}\Qt\Tools\OpenSSL\Win_x64\bin\libcrypto-1_1-x64.dll" ` - "${Env:RUNNER_WORKSPACE}\Qt\Tools\OpenSSL\Win_x64\bin\libssl-1_1-x64.dll" ` + copy "C:\Program Files\OpenSSL\bin\libcrypto-1_1-x64.dll" ` + "C:\Program Files\OpenSSL\bin\libssl-1_1-x64.dll" ` qtextpad-win64 } else { del qtextpad-win64\tls\qopensslbackend.dll