mirror of
https://github.com/libssh2/libssh2.git
synced 2025-12-11 04:02:31 +03:00
ci: drop default shared/static configuration options
Both autotools and cmake build both shared and static lib by default.
Ref: 896154bc17
Delete configuration enabling these explicitly in CI jobs.
Cherry-picked from #1036
Closes #1036
This commit is contained in:
5
.github/workflows/ci.yml
vendored
5
.github/workflows/ci.yml
vendored
@@ -88,7 +88,6 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
cmake . -B bld $TOOLCHAIN_OPTION \
|
cmake . -B bld $TOOLCHAIN_OPTION \
|
||||||
-DENABLE_WERROR=ON \
|
-DENABLE_WERROR=ON \
|
||||||
-DBUILD_SHARED_LIBS=ON \
|
|
||||||
-DCRYPTO_BACKEND=$CRYPTO_BACKEND \
|
-DCRYPTO_BACKEND=$CRYPTO_BACKEND \
|
||||||
-DENABLE_ZLIB_COMPRESSION=$ENABLE_ZLIB_COMPRESSION
|
-DENABLE_ZLIB_COMPRESSION=$ENABLE_ZLIB_COMPRESSION
|
||||||
|
|
||||||
@@ -138,7 +137,7 @@ jobs:
|
|||||||
shell: msys2 {0}
|
shell: msys2 {0}
|
||||||
run: |
|
run: |
|
||||||
# sshd tests sometimes hang
|
# sshd tests sometimes hang
|
||||||
mkdir bld && cd bld && ../configure --enable-werror --enable-debug --enable-static \
|
mkdir bld && cd bld && ../configure --enable-werror --enable-debug \
|
||||||
--with-crypto=openssl \
|
--with-crypto=openssl \
|
||||||
--disable-docker-tests \
|
--disable-docker-tests \
|
||||||
--disable-sshd-tests
|
--disable-sshd-tests
|
||||||
@@ -166,7 +165,6 @@ jobs:
|
|||||||
cmake . -B bld ${options} \
|
cmake . -B bld ${options} \
|
||||||
-DENABLE_WERROR=ON \
|
-DENABLE_WERROR=ON \
|
||||||
-DENABLE_DEBUG_LOGGING=ON \
|
-DENABLE_DEBUG_LOGGING=ON \
|
||||||
-DBUILD_SHARED_LIBS=ON \
|
|
||||||
-DCRYPTO_BACKEND=OpenSSL \
|
-DCRYPTO_BACKEND=OpenSSL \
|
||||||
-DENABLE_ZLIB_COMPRESSION=ON \
|
-DENABLE_ZLIB_COMPRESSION=ON \
|
||||||
-DRUN_DOCKER_TESTS=OFF \
|
-DRUN_DOCKER_TESTS=OFF \
|
||||||
@@ -303,7 +301,6 @@ jobs:
|
|||||||
-DCMAKE_UNITY_BUILD=ON \
|
-DCMAKE_UNITY_BUILD=ON \
|
||||||
-DENABLE_WERROR=ON \
|
-DENABLE_WERROR=ON \
|
||||||
-DENABLE_DEBUG_LOGGING=ON \
|
-DENABLE_DEBUG_LOGGING=ON \
|
||||||
-DBUILD_SHARED_LIBS=ON \
|
|
||||||
-DENABLE_ZLIB_COMPRESSION=ON \
|
-DENABLE_ZLIB_COMPRESSION=ON \
|
||||||
-DRUN_DOCKER_TESTS=OFF \
|
-DRUN_DOCKER_TESTS=OFF \
|
||||||
-DRUN_SSHD_TESTS=OFF
|
-DRUN_SSHD_TESTS=OFF
|
||||||
|
|||||||
19
appveyor.yml
19
appveyor.yml
@@ -34,14 +34,12 @@ environment:
|
|||||||
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"
|
|
||||||
CRYPTO_BACKEND: "OpenSSL"
|
CRYPTO_BACKEND: "OpenSSL"
|
||||||
|
|
||||||
- job_name: "VS2022, OpenSSL 3, x64, UWP, Build-only"
|
- job_name: "VS2022, OpenSSL 3, x64, UWP, Build-only"
|
||||||
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"
|
|
||||||
CRYPTO_BACKEND: "OpenSSL"
|
CRYPTO_BACKEND: "OpenSSL"
|
||||||
UWP: "ON"
|
UWP: "ON"
|
||||||
|
|
||||||
@@ -49,14 +47,12 @@ environment:
|
|||||||
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
|
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
|
||||||
GENERATOR: "Visual Studio 14 2015"
|
GENERATOR: "Visual Studio 14 2015"
|
||||||
PLATFORM: "x86"
|
PLATFORM: "x86"
|
||||||
BUILD_SHARED_LIBS: "ON"
|
|
||||||
CRYPTO_BACKEND: "OpenSSL"
|
CRYPTO_BACKEND: "OpenSSL"
|
||||||
|
|
||||||
- job_name: "VS2015, OpenSSL 1.1, x64, Server 2012 R2, Logging"
|
- job_name: "VS2015, OpenSSL 1.1, x64, Server 2012 R2, 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"
|
|
||||||
CRYPTO_BACKEND: "OpenSSL"
|
CRYPTO_BACKEND: "OpenSSL"
|
||||||
ENABLE_DEBUG_LOGGING: "ON"
|
ENABLE_DEBUG_LOGGING: "ON"
|
||||||
|
|
||||||
@@ -64,7 +60,6 @@ environment:
|
|||||||
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
|
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
|
||||||
GENERATOR: "Visual Studio 12 2013"
|
GENERATOR: "Visual Studio 12 2013"
|
||||||
PLATFORM: "x64"
|
PLATFORM: "x64"
|
||||||
BUILD_SHARED_LIBS: "ON"
|
|
||||||
CRYPTO_BACKEND: "OpenSSL"
|
CRYPTO_BACKEND: "OpenSSL"
|
||||||
|
|
||||||
- job_name: "VS2013, OpenSSL 1.1, x86, Server 2012 R2, Shared-only"
|
- job_name: "VS2013, OpenSSL 1.1, x86, Server 2012 R2, Shared-only"
|
||||||
@@ -72,7 +67,6 @@ environment:
|
|||||||
GENERATOR: "Visual Studio 12 2013"
|
GENERATOR: "Visual Studio 12 2013"
|
||||||
PLATFORM: "x86"
|
PLATFORM: "x86"
|
||||||
BUILD_STATIC_LIBS: "OFF"
|
BUILD_STATIC_LIBS: "OFF"
|
||||||
BUILD_SHARED_LIBS: "ON"
|
|
||||||
CRYPTO_BACKEND: "OpenSSL"
|
CRYPTO_BACKEND: "OpenSSL"
|
||||||
|
|
||||||
- job_name: "VS2013, OpenSSL 1.0.2, x64, Build-only, Static-only"
|
- job_name: "VS2013, OpenSSL 1.0.2, x64, Build-only, Static-only"
|
||||||
@@ -87,7 +81,6 @@ environment:
|
|||||||
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
|
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
|
||||||
GENERATOR: "Visual Studio 9 2008"
|
GENERATOR: "Visual Studio 9 2008"
|
||||||
PLATFORM: "x86"
|
PLATFORM: "x86"
|
||||||
BUILD_SHARED_LIBS: "ON"
|
|
||||||
CRYPTO_BACKEND: "WinCNG"
|
CRYPTO_BACKEND: "WinCNG"
|
||||||
SKIP_CTEST: "yes"
|
SKIP_CTEST: "yes"
|
||||||
|
|
||||||
@@ -95,7 +88,6 @@ environment:
|
|||||||
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
|
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
|
||||||
GENERATOR: "Visual Studio 10 2010"
|
GENERATOR: "Visual Studio 10 2010"
|
||||||
PLATFORM: "x64"
|
PLATFORM: "x64"
|
||||||
BUILD_SHARED_LIBS: "ON"
|
|
||||||
CRYPTO_BACKEND: "WinCNG"
|
CRYPTO_BACKEND: "WinCNG"
|
||||||
UNITY: "ON"
|
UNITY: "ON"
|
||||||
SKIP_CTEST: "yes"
|
SKIP_CTEST: "yes"
|
||||||
@@ -104,7 +96,6 @@ environment:
|
|||||||
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"
|
|
||||||
CRYPTO_BACKEND: "WinCNG"
|
CRYPTO_BACKEND: "WinCNG"
|
||||||
ENABLE_DEBUG_LOGGING: "ON"
|
ENABLE_DEBUG_LOGGING: "ON"
|
||||||
|
|
||||||
@@ -112,21 +103,18 @@ environment:
|
|||||||
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: "ARM64"
|
PLATFORM: "ARM64"
|
||||||
BUILD_SHARED_LIBS: "ON"
|
|
||||||
CRYPTO_BACKEND: "WinCNG"
|
CRYPTO_BACKEND: "WinCNG"
|
||||||
|
|
||||||
- job_name: "VS2015, WinCNG, x86, Server 2016"
|
- job_name: "VS2015, WinCNG, x86, Server 2016"
|
||||||
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
|
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
|
||||||
GENERATOR: "Visual Studio 14 2015"
|
GENERATOR: "Visual Studio 14 2015"
|
||||||
PLATFORM: "x86"
|
PLATFORM: "x86"
|
||||||
BUILD_SHARED_LIBS: "ON"
|
|
||||||
CRYPTO_BACKEND: "WinCNG"
|
CRYPTO_BACKEND: "WinCNG"
|
||||||
|
|
||||||
- job_name: "VS2015, WinCNG, x64, Server 2012 R2"
|
- job_name: "VS2015, WinCNG, x64, Server 2012 R2"
|
||||||
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"
|
|
||||||
CRYPTO_BACKEND: "WinCNG"
|
CRYPTO_BACKEND: "WinCNG"
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
@@ -175,11 +163,14 @@ build_script:
|
|||||||
if($env:BUILD_STATIC_LIBS -eq "OFF") {
|
if($env:BUILD_STATIC_LIBS -eq "OFF") {
|
||||||
$env:CMAKE_ARG += " -DBUILD_STATIC_LIBS=OFF"
|
$env:CMAKE_ARG += " -DBUILD_STATIC_LIBS=OFF"
|
||||||
}
|
}
|
||||||
|
if($env:BUILD_SHARED_LIBS -eq "OFF") {
|
||||||
|
$env:CMAKE_ARG += " -DBUILD_SHARED_LIBS=OFF"
|
||||||
|
}
|
||||||
$env:CMAKE_ARG += " -DCMAKE_VS_GLOBALS=TrackFileAccess=false"
|
$env:CMAKE_ARG += " -DCMAKE_VS_GLOBALS=TrackFileAccess=false"
|
||||||
# FIXME: First sshd test sometimes timeouts, subsequent ones almost always fail:
|
# FIXME: First sshd test sometimes timeouts, subsequent ones almost always fail:
|
||||||
# 'libssh2_session_handshake failed (-43): Failed getting banner'
|
# 'libssh2_session_handshake failed (-43): Failed getting banner'
|
||||||
- echo cmake "-G%GENERATOR%" %CMAKE_ARG% -DENABLE_WERROR=ON -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DCRYPTO_BACKEND=%CRYPTO_BACKEND% -DRUN_SSHD_TESTS=OFF
|
- echo cmake "-G%GENERATOR%" %CMAKE_ARG% -DENABLE_WERROR=ON -DCRYPTO_BACKEND=%CRYPTO_BACKEND% -DRUN_SSHD_TESTS=OFF
|
||||||
- cmake . -B _builds "-G%GENERATOR%" %CMAKE_ARG% -DENABLE_WERROR=ON -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DCRYPTO_BACKEND=%CRYPTO_BACKEND% -DRUN_SSHD_TESTS=OFF
|
- cmake . -B _builds "-G%GENERATOR%" %CMAKE_ARG% -DENABLE_WERROR=ON -DCRYPTO_BACKEND=%CRYPTO_BACKEND% -DRUN_SSHD_TESTS=OFF
|
||||||
- cmake --build _builds --config "%CONFIGURATION%"
|
- cmake --build _builds --config "%CONFIGURATION%"
|
||||||
|
|
||||||
test_script:
|
test_script:
|
||||||
|
|||||||
Reference in New Issue
Block a user