From 84f6acbfb4c20d507783d8114f7f968af29f9982 Mon Sep 17 00:00:00 2001 From: Robosturm Date: Sat, 11 Nov 2023 20:18:20 +0100 Subject: [PATCH] test enforce gcc path --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 47f96c6f3..56f25e1ae 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: qtTools: 'tools_mingw90' installerCommands1: choco install openssl --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"' + 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" -DCXX_COMPILER_PATH="${{github.workspace}}/qt/Qt/Tools/mingw1120_64/bin/" -DC_COMPILER_PATH="${{github.workspace}}/qt/Qt/Tools/mingw1120_64/bin/"' - buildTarget: windows-server # test build to check if the server configuration compiles as well os: windows-latest COMPILER_VERSION: 'win64_mingw' @@ -32,7 +32,7 @@ jobs: qtTools: 'tools_mingw90' installerCommands1: choco install openssl --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" -DGRAPHICSUPPORT=OFF -DAUDIOSUPPORT=OFF -DUPDATESUPPORT=OFF' + 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" -DGRAPHICSUPPORT=OFF -DAUDIOSUPPORT=OFF -DUPDATESUPPORT=OFF -DCXX_COMPILER_PATH="${{github.workspace}}/qt/Qt/Tools/mingw1120_64/bin/" -DC_COMPILER_PATH="${{github.workspace}}/qt/Qt/Tools/mingw1120_64/bin/"' - buildTarget: ubuntu-desktop os: ubuntu-latest COMPILER_VERSION: ''