Commit 42c5d7c20e9627a4c88289e6353786a112118339
2020-06-06T23:02:10
Update main.yml
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 98a353e..3aadee3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -59,15 +59,33 @@ jobs:
cc: gcc
cmake_generator: Ninja
cmake_options: -DUSE_HTTPS=OpenSSL -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
- -
+ - # macOS
os: macos-latest
- -
+ pkg_config_path: /usr/local/opt/openssl/lib/pkgconfig
+ cmake_generator: Ninja
+ cmake_options: -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=leaks -DUSE_GSSAPI=ON
+ skip_ssh_tests: true
+ - # Windows Visual Studio amd64
+ os: windows-latest
+ cmake_generator: Visual Studio 15 2017
+ cmake_options: -A Win32 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS
+ skip_ssh_tests: true
+ skip_negotiate_tests: true
+ - # Windows Visual Studio amd64
os: windows-latest
+ cmake_generator: Visual Studio 15 2017
+ cmake_options: -A x64 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON
+ skip_ssh_tests: true
+ skip_negotiate_tests: true
fail-fast: false
+ # Turn matrix variables into environment variables.
env:
CC: ${{ matrix.platform.cc }}
CMAKE_GENERATOR: ${{ matrix.platform.cmake_generator }}
CMAKE_OPTIONS: ${{ matrix.platform.cmake_options }}
+ PKG_CONFIG_PATH: ${{ matrix.platform.pkg_config_path }}
+ SKIP_SSH_TESTS: ${{ matrix.platform.skip_ssh_tests }}
+ SKIP_NEGOTIATE_TESTS: ${{ matrix.platform.skip_negotiate_tests }}
name: Build
runs-on: ${{ matrix.platform.os }}
steps: