Skip to content

Fix Windows CI: harden OpenSSL install retry and make CPack resilient to missing OpenSSL files #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomas-soltys merged 2 commits into from
Apr 29, 2026
Merged

Fix Windows CI: harden OpenSSL install retry and make CPack resilient to missing OpenSSL files #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbee8f4
Initial plan
Copilot Apr 29, 2026
ae61f73
Fix Windows CI: harden OpenSSL install step and CMake bundling
Copilot Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,26 @@ jobs:

- name: Install OpenSSL (Windows)
if: startsWith(matrix.os, 'windows-')
run: |
choco install openssl.light -y --params "/InstallDir:C:\OpenSSL" || echo "OpenSSL may already be installed"
# Persist OPENSSL_ROOT for later CMake configure step
Write-Output "OPENSSL_ROOT=C:\OpenSSL" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
shell: pwsh
run: |
$ErrorActionPreference = 'Stop'
$installDir = 'C:\OpenSSL'
$max = 3
for ($i = 1; $i -le $max; $i++) {
try {
choco install openssl.light -y --params "/InstallDir:$installDir"
break
} catch {
if ($i -eq $max) { throw }
Write-Host "OpenSSL install failed (attempt $i/$max). Retrying in 20s..."
Start-Sleep -Seconds 20
}
}
if (Test-Path "$installDir\bin\openssl.exe") {
"OPENSSL_ROOT=$installDir" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
} else {
Write-Host "OpenSSL not found at $installDir; not setting OPENSSL_ROOT."
}

# Qt
- name: Install Qt 6.10.2 + QtIFW
Expand Down
13 changes: 10 additions & 3 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,16 @@ if(WIN32)
install(DIRECTORY ${_qt_deploy_dir}/ DESTINATION bin COMPONENT Application)
install(FILES ${CMAKE_BINARY_DIR}/LICENSE.txt DESTINATION doc COMPONENT Application)
if(OPENSSL_ROOT)
install(FILES ${OPENSSL_ROOT}/bin/openssl.exe DESTINATION bin COMPONENT Application)
install(FILES ${OPENSSL_ROOT}/bin/libcrypto-3-x64.dll DESTINATION bin COMPONENT Application)
install(FILES ${OPENSSL_ROOT}/bin/libssl-3-x64.dll DESTINATION bin COMPONENT Application)
set(_openssl_exe "${OPENSSL_ROOT}/bin/openssl.exe")
set(_openssl_crypto "${OPENSSL_ROOT}/bin/libcrypto-3-x64.dll")
set(_openssl_ssl "${OPENSSL_ROOT}/bin/libssl-3-x64.dll")
if(EXISTS "${_openssl_exe}" AND EXISTS "${_openssl_crypto}" AND EXISTS "${_openssl_ssl}")
install(FILES "${_openssl_exe}" DESTINATION bin COMPONENT Application)
install(FILES "${_openssl_crypto}" DESTINATION bin COMPONENT Application)
install(FILES "${_openssl_ssl}" DESTINATION bin COMPONENT Application)
else()
message(WARNING "OPENSSL_ROOT is set to '${OPENSSL_ROOT}', but required OpenSSL runtime files were not found. Skipping bundling OpenSSL into the installer.")
endif()
endif()
elseif(APPLE)
install(DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_TARGET_NAME}/${PROJECT_SHORT_REL_NAME}.app DESTINATION . USE_SOURCE_PERMISSIONS COMPONENT Application)
Expand Down
Loading