lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-10-30 12:05:34 +03:00
Code Activity

ci: really enable logging in AppVeyor CMake builds

Browse Source 
`CONFIGURATION` was never passed to the cmake command, so it had
never enabled logging when set to `Debug`.

Also `CONFIGURATION` is ambiguous depending on the "generator" used
by CMake. In case of Visual Studio, this is a build/ctest-time
setting, not a cmake-config parameter.

So set this permanently to `Release` and enable logging via our
dedicated CMake option `ENABLE_DEBUG_LOGGING`.

Tested in #979
This commit is contained in:
Viktor Szakats
2023-04-19 18:07:20 +00:00
parent e4d827479c
commit 2d0bd5837b
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
appveyor.yml
View File

@@ -25,6 +25,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
environment: environment:
CONFIGURATION: "Release"
matrix: matrix:
- job_name: "VS2022, OpenSSL3, x64" - job_name: "VS2022, OpenSSL3, x64"
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2022" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2022"
@@ -32,7 +33,6 @@ environment:
PLATFORM: "x64" PLATFORM: "x64"
BUILD_SHARED_LIBS: "ON" BUILD_SHARED_LIBS: "ON"
CRYPTO_BACKEND: "OpenSSL" CRYPTO_BACKEND: "OpenSSL"
CONFIGURATION: "Release"
- job_name: "VS2015, OpenSSL, x86" - job_name: "VS2015, OpenSSL, x86"
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
@@ -40,15 +40,14 @@ environment:
PLATFORM: "x86" PLATFORM: "x86"
BUILD_SHARED_LIBS: "ON" BUILD_SHARED_LIBS: "ON"
CRYPTO_BACKEND: "OpenSSL" CRYPTO_BACKEND: "OpenSSL"
CONFIGURATION: "Release"
- job_name: "VS2015, OpenSSL, x64, Debug" - job_name: "VS2015, OpenSSL, x64, Logging"
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
GENERATOR: "Visual Studio 14 2015" GENERATOR: "Visual Studio 14 2015"
PLATFORM: "x64" PLATFORM: "x64"
BUILD_SHARED_LIBS: "ON" BUILD_SHARED_LIBS: "ON"
CRYPTO_BACKEND: "OpenSSL" CRYPTO_BACKEND: "OpenSSL"
CONFIGURATION: "Debug" ENABLE_DEBUG_LOGGING: "ON"
- job_name: "VS2013, OpenSSL, x64" - job_name: "VS2013, OpenSSL, x64"
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
@@ -56,7 +55,6 @@ environment:
PLATFORM: "x64" PLATFORM: "x64"
BUILD_SHARED_LIBS: "ON" BUILD_SHARED_LIBS: "ON"
CRYPTO_BACKEND: "OpenSSL" CRYPTO_BACKEND: "OpenSSL"
CONFIGURATION: "Release"
- job_name: "VS2013, OpenSSL, x86" - job_name: "VS2013, OpenSSL, x86"
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
@@ -64,7 +62,6 @@ environment:
PLATFORM: "x86" PLATFORM: "x86"
BUILD_SHARED_LIBS: "ON" BUILD_SHARED_LIBS: "ON"
CRYPTO_BACKEND: "OpenSSL" CRYPTO_BACKEND: "OpenSSL"
CONFIGURATION: "Release"
- job_name: "VS2013, OpenSSL, x64, Static-only, Build-only" - job_name: "VS2013, OpenSSL, x64, Static-only, Build-only"
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
@@ -72,7 +69,6 @@ environment:
PLATFORM: "x64" PLATFORM: "x64"
BUILD_SHARED_LIBS: "OFF" BUILD_SHARED_LIBS: "OFF"
CRYPTO_BACKEND: "OpenSSL" CRYPTO_BACKEND: "OpenSSL"
CONFIGURATION: "Release"
SKIP_CTEST: "yes" SKIP_CTEST: "yes"
- job_name: "VS2010, WinCNG, x64, Build-only" - job_name: "VS2010, WinCNG, x64, Build-only"
@@ -81,7 +77,6 @@ environment:
PLATFORM: "x64" PLATFORM: "x64"
BUILD_SHARED_LIBS: "ON" BUILD_SHARED_LIBS: "ON"
CRYPTO_BACKEND: "WinCNG" CRYPTO_BACKEND: "WinCNG"
CONFIGURATION: "Release"
SKIP_CTEST: "yes" SKIP_CTEST: "yes"
- job_name: "VS2008, WinCNG, x86, Build-only" - job_name: "VS2008, WinCNG, x86, Build-only"
@@ -90,16 +85,15 @@ environment:
PLATFORM: "x86" PLATFORM: "x86"
BUILD_SHARED_LIBS: "ON" BUILD_SHARED_LIBS: "ON"
CRYPTO_BACKEND: "WinCNG" CRYPTO_BACKEND: "WinCNG"
CONFIGURATION: "Release"
SKIP_CTEST: "yes" SKIP_CTEST: "yes"
- job_name: "VS2022, WinCNG, x64, Debug" - job_name: "VS2022, WinCNG, x64, Logging"
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2022" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2022"
GENERATOR: "Visual Studio 17 2022" GENERATOR: "Visual Studio 17 2022"
PLATFORM: "x64" PLATFORM: "x64"
BUILD_SHARED_LIBS: "ON" BUILD_SHARED_LIBS: "ON"
CRYPTO_BACKEND: "WinCNG" CRYPTO_BACKEND: "WinCNG"
CONFIGURATION: "Debug" ENABLE_DEBUG_LOGGING: "ON"
- job_name: "VS2022, WinCNG, ARM64, Build-only" - job_name: "VS2022, WinCNG, ARM64, Build-only"
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2022" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2022"
@@ -107,7 +101,6 @@ environment:
PLATFORM: "ARM64" PLATFORM: "ARM64"
BUILD_SHARED_LIBS: "ON" BUILD_SHARED_LIBS: "ON"
CRYPTO_BACKEND: "WinCNG" CRYPTO_BACKEND: "WinCNG"
CONFIGURATION: "Release"
- job_name: "VS2015, WinCNG, x86" - job_name: "VS2015, WinCNG, x86"
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
@@ -115,7 +108,6 @@ environment:
PLATFORM: "x86" PLATFORM: "x86"
BUILD_SHARED_LIBS: "ON" BUILD_SHARED_LIBS: "ON"
CRYPTO_BACKEND: "WinCNG" CRYPTO_BACKEND: "WinCNG"
CONFIGURATION: "Release"
- job_name: "VS2015, WinCNG, x64" - job_name: "VS2015, WinCNG, x64"
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
@@ -123,7 +115,6 @@ environment:
PLATFORM: "x64" PLATFORM: "x64"
BUILD_SHARED_LIBS: "ON" BUILD_SHARED_LIBS: "ON"
CRYPTO_BACKEND: "WinCNG" CRYPTO_BACKEND: "WinCNG"
CONFIGURATION: "Release"
matrix: matrix:
fast_finish: true fast_finish: true
@@ -159,6 +150,9 @@ build_script:
} }
} }
} }
if($env:ENABLE_DEBUG_LOGGING -eq "ON") {
$env:CMAKE_ARG += " -DENABLE_DEBUG_LOGGING=ON"
}
- echo cmake "-G%GENERATOR%" %CMAKE_ARG% -DENABLE_WERROR=ON -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DCRYPTO_BACKEND=%CRYPTO_BACKEND% - echo cmake "-G%GENERATOR%" %CMAKE_ARG% -DENABLE_WERROR=ON -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DCRYPTO_BACKEND=%CRYPTO_BACKEND%
- cmake . -B _builds "-G%GENERATOR%" %CMAKE_ARG% -DENABLE_WERROR=ON -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DCRYPTO_BACKEND=%CRYPTO_BACKEND% - cmake . -B _builds "-G%GENERATOR%" %CMAKE_ARG% -DENABLE_WERROR=ON -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DCRYPTO_BACKEND=%CRYPTO_BACKEND%
- cmake --build _builds --config "%CONFIGURATION%" - cmake --build _builds --config "%CONFIGURATION%"