From b99ceb658a6f40913c4a06225cfeb477dc434835 Mon Sep 17 00:00:00 2001 From: Jakob Date: Sun, 24 Sep 2023 14:24:11 +0200 Subject: [PATCH] Fix OpenSSL build failure (#1788) --- .github/actions/create-package/create-package.sh | 8 +++++--- .github/actions/install-dependencies/action.yml | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/actions/create-package/create-package.sh b/.github/actions/create-package/create-package.sh index 7c6405f2c..8a516415e 100755 --- a/.github/actions/create-package/create-package.sh +++ b/.github/actions/create-package/create-package.sh @@ -104,9 +104,11 @@ create_package_windows() { windeployqt Pencil2D/pencil2d.exe echo "::endgroup::" echo "Copy OpenSSL DLLs" - local xbits="-x${platform#win}" - local _xbits="_x${platform#win}" - cp "${IQTA_TOOLS}\\OpenSSL\\Win${_xbits/32/86}\\bin\\lib"{ssl,crypto}"-1_1${xbits/-x32/}.dll" Pencil2D/ + curl -fsSLO https://download.firedaemon.com/FireDaemon-OpenSSL/openssl-1.1.1w.zip + "${WINDIR}\\System32\\tar" xf openssl-1.1.1w.zip + local xbits="x${platform#win}" + local _xbits="-${xbits}" + cp "openssl-1.1\\${xbits/32/86}\\bin\\lib"{ssl,crypto}"-1_1${_xbits/-x32/}.dll" Pencil2D/ echo "Create ZIP" local qtsuffix="-qt${INPUT_QT}" "${WINDIR}\\System32\\tar" caf "pencil2d${qtsuffix/-qt5/}-${platform}-$1-$(date +%F).zip" Pencil2D diff --git a/.github/actions/install-dependencies/action.yml b/.github/actions/install-dependencies/action.yml index a1d840d26..ab8d9f5f8 100644 --- a/.github/actions/install-dependencies/action.yml +++ b/.github/actions/install-dependencies/action.yml @@ -19,6 +19,5 @@ runs: uses: jurplel/install-qt-action@v3 with: arch: ${{inputs.arch}} - tools: tools_openssl_x${{endsWith(inputs.arch, '_64') && '64' || '86'}} version: ${{matrix.qt == 6 && '6.4.2' || '5.15.2'}} modules: ${{matrix.qt == 6 && 'qtmultimedia' || ''}}