Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated appveyor cfg and scripts
  • Loading branch information
Panos committed Dec 16, 2020
commit 7a21878b820a1f3426f716fd27b288423703ca0b
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ build:
parallel: true
verbosity: minimal
skip_branch_with_pr: true
image: Visual Studio 2019

environment:
global:
Expand All @@ -18,7 +19,6 @@ environment:
# Python versions to build wheels for
PYTHONVERS: C:\Python36-x64 C:\Python37-x64 C:\Python38-x64 C:\Python39-x64
PYTHON_ARCH: "64"
MSVC: "Visual Studio 14 Win64"

install:
# If there is a newer build queued for the same PR, cancel this one.
Expand Down
4 changes: 1 addition & 3 deletions ci/appveyor/build_ssh.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ IF "%PYTHON_VERSION%" == "2.7" (exit 0)
mkdir src
cd src

set CMAKE_PLATFORM="%MSVC%"

cmake ..\libssh -G %CMAKE_PLATFORM% ^
cmake ..\libssh ^
-DCMAKE_BUILD_TYPE=Release ^
-DZLIB_LIBRARY=C:/zlib/lib/zlibstatic.lib ^
-DZLIB_INCLUDE_DIR=C:/zlib/include ^
Expand Down
17 changes: 4 additions & 13 deletions ci/appveyor/build_zlib.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,10 @@ IF "%PYTHON_VERSION%" == "2.7" (exit 0)

mkdir zlib_build && cd zlib_build

IF "%MSVC%" == "Visual Studio 9" (
ECHO "Building without platform set"
cmake ..\zlib-1.2.11 -G "NMake Makefiles" ^
-DCMAKE_INSTALL_PREFIX="C:\zlib" ^
-DCMAKE_BUILD_TYPE=Release ^
-DBUILD_SHARED_LIBS=OFF
) ELSE (
ECHO "Building with platform %MSVC%"
cmake ..\zlib-1.2.11 ^
-G"%MSVC%" ^
-DCMAKE_INSTALL_PREFIX="C:\zlib" ^
-DCMAKE_BUILD_TYPE=Release ^
-DBUILD_SHARED_LIBS=OFF
cmake ..\zlib-1.2.11 ^
-DCMAKE_INSTALL_PREFIX="C:\zlib" ^
-DCMAKE_BUILD_TYPE=Release ^
-DBUILD_SHARED_LIBS=OFF
)

cmake --build . --config Release --target install
Expand Down