diff options
| -rw-r--r-- | .azure-pipelines.yml | 32 | ||||
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | configure.ac | 2 |
3 files changed, 31 insertions, 6 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index c57fc4b81..efe1d5742 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -77,12 +77,12 @@ jobs: - script: make test-nonflaky displayName: 'test' - - job: vanilla_macos + - job: macos_plain displayName: macos default pool: vmImage: 'macOS-latest' steps: - - script: brew update && brew install libtool autoconf automake nghttp2 + - script: brew update && brew install libtool autoconf automake nghttp2 pkg-config displayName: Install packages - script: ./buildconf && ./configure @@ -93,3 +93,31 @@ jobs: - script: make test-nonflaky displayName: 'test' + + - job: macos_libssh2 + displayName: macos libssh2 + pool: + vmImage: 'macOS-latest' + steps: + - script: brew update && brew install libtool autoconf automake nghttp2 pkg-config libssh2 + displayName: Install packages + + - script: ./buildconf && ./configure --with-libssh2 --enable-debug + displayName: 'Run configure' + + - script: make + displayName: 'make' + + - script: make test-nonflaky + displayName: 'test' + + - job: macos_cmake + displayName: macos cmake openssl + pool: + vmImage: 'macOS-latest' + steps: + - script: brew update && brew install libtool autoconf automake nghttp2 pkg-config cmake openssl + displayName: Install packages + + - script: cmake -H. -Bbuild -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON && cmake --build build + displayName: 'Run cmake' diff --git a/.travis.yml b/.travis.yml index 16bbb1c3e..4f0c0c5c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -247,9 +247,6 @@ matrix: - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8" - os: osx compiler: gcc - env: T=debug C=--with-libssh2 - - os: osx - compiler: gcc env: T=debug C="--disable-dict --disable-file --disable-ftp --disable-gopher --disable-imap --disable-ldap --disable-pop3 --disable-rtmp --disable-rtsp --disable-scp --disable-sftp --disable-smb --disable-smtp --disable-telnet --disable-tftp --disable-unix-sockets --disable-shared --enable-debug --enable-maintainer-mode --without-brotli --without-gssapi --without-libidn2 --without-libmetalink --without-libpsl --without-librtmp --without-libssh2 --without-nghttp2 --without-ntlm-auth --without-ssl --without-zlib" - os: osx compiler: gcc diff --git a/configure.ac b/configure.ac index 3e156bcae..dd149b7e3 100755 --- a/configure.ac +++ b/configure.ac @@ -157,7 +157,7 @@ AC_SUBST(PKGADD_VENDOR) dnl dnl initialize all the info variables curl_ssl_msg="no (--with-{ssl,gnutls,nss,mbedtls,wolfssl,schannel,secure-transport,mesalink,amissl,bearssl} )" - curl_ssh_msg="no (--with-libssh2)" + curl_ssh_msg="no (--with-{libssh,libssh2})" curl_zlib_msg="no (--with-zlib)" curl_brotli_msg="no (--with-brotli)" curl_gss_msg="no (--with-gssapi)" |