Skip to content

Commit

Permalink
build: fix invalid OpenSSL version used in portable releases (fix #3244)
Browse files Browse the repository at this point in the history
  • Loading branch information
Bionus committed Jul 19, 2024
1 parent 1b570b3 commit 4f5b880
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -433,8 +433,6 @@ jobs:
curl -Lo OpenSSL.exe "https://github.com/Bionus/imgbrd-grabber/releases/download/sources-master/Win64OpenSSL-3_1_4.exe" --fail
OpenSSL.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- /DIR="%OPENSSL_ROOT_DIR%"
rm OpenSSL.exe
dir %OPENSSL_ROOT_DIR%
dir %OPENSSL_ROOT_DIR%\bin
- name: Download MySQL driver
if: steps.vendor-cache.outputs.cache-hit != 'true'
Expand Down
6 changes: 3 additions & 3 deletions scripts/package-windows.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ copy %Qt6_Dir%\lib\qscintilla2_qt6.dll "release"
copy %Qt6_Dir%\bin\Qt6PrintSupport.dll "release"

:: Add OpenSSL and MySQL DLL
copy %OPENSSL_ROOT_DIR%/libcrypto-3*.dll "release"
copy %OPENSSL_ROOT_DIR%/libssl-3*.dll "release"
copy %MYSQL_DRIVER_DIR%/libmysql.dll "release"
copy %OPENSSL_ROOT_DIR%\libcrypto-3*.dll "release"
copy %OPENSSL_ROOT_DIR%\libssl-3*.dll "release"
copy %MYSQL_DRIVER_DIR%\libmysql.dll "release"

:: Zip the whole directory
pushd release
Expand Down

0 comments on commit 4f5b880

Please sign in to comment.