Skip to content

Commit

Permalink
forced openssl update for windows
Browse files Browse the repository at this point in the history
  • Loading branch information
Robosturm committed Jun 16, 2024
1 parent 9646469 commit 572adb3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
target: 'desktop'
qtPath: 'mingw_64'
qtTools: 'tools_mingw90'
installerCommands1: choco install openssl --version=3.2.1 --force -y --install-arguments="'/DIR=C:/openSsl/'"
installerCommands1: choco install openssl --version=3.3.1 --force -y --install-arguments="'/DIR=C:/openSsl/'"
installerCommands2: ''
cmakeOptions: '"-DCMAKE_GENERATOR:STRING=MinGW Makefiles" -DOPENSSL_LIB_PATH="C:/openSsl/bin" -DOPENSSL_INCLUDE_DIR="C:/openSsl/include" -DOPENSSL_USE_STATIC_LIBS="ON" -DPRECOMPILEDOPENSSL="ON" "-DCMAKE_C_COMPILER:FILEPATH=D:/a/Commander_Wars/Commander_Wars/qt/Qt/Tools/mingw1120_64/bin/gcc.exe" "-DCMAKE_CXX_COMPILER:FILEPATH=D:/a/Commander_Wars/Commander_Wars/qt/Qt/Tools/mingw1120_64/bin/g++.exe"'
- buildTarget: windows-server # test build to check if the server configuration compiles as well
Expand All @@ -32,7 +32,7 @@ jobs:
target: 'desktop'
qtPath: 'mingw_64'
qtTools: 'tools_mingw90'
installerCommands1: choco install openssl --version=3.2.1 --force -y --install-arguments="'/DIR=C:/openSsl/'"
installerCommands1: choco install openssl --version=3.3.1 --force -y --install-arguments="'/DIR=C:/openSsl/'"
installerCommands2: ''
cmakeOptions: '"-DCMAKE_GENERATOR:STRING=MinGW Makefiles" -DOPENSSL_LIB_PATH="C:/openSsl/bin" -DOPENSSL_INCLUDE_DIR="C:/openSsl/include" -DOPENSSL_USE_STATIC_LIBS="ON" -DPRECOMPILEDOPENSSL="ON" -DOPENSSL_USE_STATIC_LIBS=FALSE -DGRAPHICSUPPORT=OFF -DAUDIOSUPPORT=OFF -DUPDATESUPPORT=OFF "-DCMAKE_C_COMPILER:FILEPATH=D:/a/Commander_Wars/Commander_Wars/qt/Qt/Tools/mingw1120_64/bin/gcc.exe" "-DCMAKE_CXX_COMPILER:FILEPATH=D:/a/Commander_Wars/Commander_Wars/qt/Qt/Tools/mingw1120_64/bin/g++.exe"'
- buildTarget: ubuntu-desktop
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
target: 'desktop'
qtPath: 'mingw_64'
qtTools: 'tools_mingw90'
installerCommands1: choco install openssl --version=3.2.1 --force -y --install-arguments="'/DIR=C:/openSsl/'"
installerCommands1: choco install openssl --version=3.3.1 --force -y --install-arguments="'/DIR=C:/openSsl/'"
installerCommands2: ''
source_asset: 'Commander_Wars.zip'
asset_name: 'Commander_Wars_Win10_x64.zip'
Expand All @@ -57,7 +57,7 @@ jobs:
target: 'desktop'
qtPath: 'mingw_64'
qtTools: 'tools_mingw90'
installerCommands1: choco install openssl --version=3.2.1 --force -y --install-arguments="'/DIR=C:/openSsl/'"
installerCommands1: choco install openssl --version=3.3.1 --force -y --install-arguments="'/DIR=C:/openSsl/'"
installerCommands2: ''
source_asset: 'Commander_Wars.zip'
asset_name: 'Commander_Wars_Win10_x64_Server.zip'
Expand Down

0 comments on commit 572adb3

Please sign in to comment.