diff options
| -rw-r--r-- | .azure-pipelines.yml | 82 | ||||
| -rw-r--r-- | .github/workflows/macos.yml | 88 | ||||
| -rw-r--r-- | .travis.yml | 25 |
3 files changed, 88 insertions, 107 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index ac00a8e4d..cfab11e77 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -173,88 +173,6 @@ stages: TFLAGS: "-n -t --shallow=40 !FTP" ########################################## -### macOS jobs below -########################################## - -- stage: macos - dependsOn: [] - jobs: - - job: macos_vanilla - displayName: macos default - timeoutInMinutes: 30 - pool: - vmImage: 'macOS-latest' - steps: - - script: brew update && brew install libtool autoconf automake nghttp2 pkg-config - displayName: 'brew install' - - - script: ./buildconf && ./configure --enable-debug --enable-werror --without-brotli - displayName: 'configure debug without brotli' - - - script: make - displayName: 'make' - - - script: make test-nonflaky - displayName: 'test' - env: - AZURE_ACCESS_TOKEN: "$(System.AccessToken)" - - - job: macos_libssh2 - displayName: macos libssh2 - timeoutInMinutes: 30 - pool: - vmImage: 'macOS-latest' - steps: - - script: brew update && brew install libtool autoconf automake nghttp2 pkg-config libssh2 - displayName: 'brew install' - - - script: ./buildconf && ./configure --enable-debug --with-libssh2 - displayName: 'configure debug with libssh2' - - - script: make - displayName: 'make' - - - script: make test-nonflaky - displayName: 'test' - env: - AZURE_ACCESS_TOKEN: "$(System.AccessToken)" - - - job: macos_cmake - displayName: macos cmake openssl - timeoutInMinutes: 20 - pool: - vmImage: 'macOS-latest' - steps: - - script: brew update && brew install libtool autoconf automake nghttp2 pkg-config openssl - displayName: 'brew install' - - - script: cmake -H. -Bbuild -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON && cmake --build build - displayName: 'cmake build' - -- stage: macos_torture - dependsOn: macos - jobs: - - job: macos_torture - displayName: macos torture - timeoutInMinutes: 60 - pool: - vmImage: 'macOS-latest' - steps: - - script: brew update && brew install libtool autoconf automake nghttp2 pkg-config - displayName: 'brew install' - - - script: ./buildconf && ./configure --enable-debug --disable-shared --disable-threaded-resolver --enable-alt-svc - displayName: 'configure torture' - - - script: make - displayName: 'make' - - - script: make test-nonflaky - displayName: 'torture test' - env: - TFLAGS: "-n -t --shallow=25 !FTP" - -########################################## ### Windows jobs below ########################################## diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml new file mode 100644 index 000000000..36eb46d63 --- /dev/null +++ b/.github/workflows/macos.yml @@ -0,0 +1,88 @@ +name: CI
+
+on: [push, pull_request]
+
+jobs:
+ autotools:
+ name: macos ${{ matrix.build.name }}
+ runs-on: 'macos-latest'
+ strategy:
+ fail-fast: false
+ matrix:
+ build:
+ - name: normal
+ install: nghttp2
+ - name: debug
+ install: nghttp2
+ configure: --enable-debug --enable-werror --without-brotli
+ - name: libssh2
+ install: nghttp2 libssh2
+ configure: --enable-debug --with-libssh2
+ - name: c-ares
+ install: nghttp2
+ configure: --enable-debug --enable-ares
+ - name: HTTP only
+ install: nghttp2
+ configure: --enable-debug --enable-werror --enable-maintainer-mode --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 --without-brotli --without-gssapi --without-libidn2 --without-libmetalink --without-libpsl --without-librtmp --without-libssh2 --without-nghttp2 --without-ntlm-auth --without-ssl --without-zlib
+ - name: SecureTransport metalink
+ install: nghttp2 openssl libmetalink
+ configure: --enable-debug --without-ssl --with-darwinssl --with-libmetalink
+ - name: OpenSSL metalink
+ install: nghttp2 openssl libmetalink
+ configure: --enable-debug --with-ssl=/usr/local/opt/openssl --with-libmetalink
+ - name: LibreSSL metalink
+ install: nghttp2 libressl libmetalink
+ configure: --enable-debug --with-ssl=/usr/local/opt/libressl --with-libmetalink
+ - name: torture
+ install: nghttp2 openssl
+ configure: --enable-debug --disable-shared --disable-threaded-resolver --enable-alt-svc
+ tflags: -n -t --shallow=25 !FTP
+ steps:
+ - uses: actions/checkout@v2
+
+ - run: brew update && brew install libtool autoconf automake pkg-config ${{ matrix.build.install }}
+ name: 'brew install'
+
+ - run: ./buildconf && ./configure ${{ matrix.build.configure }}
+ name: 'configure'
+
+ - run: make
+ name: 'make'
+
+ - run: make test-nonflaky
+ name: 'test'
+ env:
+ TFLAGS: "${{ matrix.build.tflags }} ~1452"
+
+ cmake:
+ name: macos cmake ${{ matrix.compiler.CC }} ${{ matrix.build.name }}
+ runs-on: 'macos-latest'
+ env: ${{ matrix.compiler }}
+ strategy:
+ fail-fast: false
+ matrix:
+ compiler:
+ - CC: clang
+ CXX: clang++
+ - CC: gcc-8
+ CXX: g++-8
+ - CC: gcc-9
+ CXX: g++-9
+ build:
+ - name: OpenSSL
+ install: nghttp2 openssl
+ generate: -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON
+ - name: LibreSSL
+ install: nghttp2 libressl
+ generate: -DOPENSSL_ROOT_DIR=/usr/local/opt/libressl -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON
+ steps:
+ - uses: actions/checkout@v2
+
+ - run: brew update && brew install libtool autoconf automake pkg-config ${{ matrix.build.install }}
+ name: 'brew install'
+
+ - run: cmake -H. -Bbuild ${{ matrix.build.generate }}
+ name: 'cmake generate'
+
+ - run: cmake --build build
+ name: 'cmake build'
diff --git a/.travis.yml b/.travis.yml index 580bf6223..88cb83571 100644 --- a/.travis.yml +++ b/.travis.yml @@ -267,28 +267,6 @@ matrix: env: - T=iconv - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8" - - 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 - env: T=debug C=--enable-ares - - os: osx - compiler: gcc - env: T=debug C="--with-ssl=/usr/local/opt/openssl --with-libmetalink" - - os: osx - compiler: gcc - env: T=debug C="--with-ssl=/usr/local/opt/libressl --with-libmetalink" - - os: osx - compiler: clang - osx_image: xcode10 - env: T=debug C="--without-ssl --with-darwinssl --with-libmetalink" - - os: osx - compiler: clang - env: T=normal - - os: osx - compiler: clang - env: T=cmake - os: linux compiler: gcc dist: bionic @@ -441,9 +419,6 @@ before_install: install: - if [ "$T" = "coverage" ]; then pip2 install --user cpp-coveralls; fi - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update > /dev/null; fi - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew reinstall libtool > /dev/null; fi - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install rtmpdump libssh2 c-ares libmetalink libressl nghttp2 libmetalink; fi # before_script and script: # Travis isn't reliable catching errors in inline script commands (#3730). |