cirrus-ci: add more macOS builds with m1 based on x86_64 builds

Also refactor macOS builds to use task matrix.

Assisted-by: Marc Hörsken
Closes #9565
This commit is contained in:
Philip H 2022-10-09 22:41:21 +02:00 committed by Marc Hoersken
parent 86f2d8f67f
commit 1de60b18de
No known key found for this signature in database
GPG Key ID: 61E03CBED7BC859E

View File

@ -142,17 +142,70 @@ macos_task:
matrix:
- name: macOS arm64 normal
env:
CFLAGS: "-Wno-vla -mmacosx-version-min=10.9"
install_packages: nghttp2
configure: --without-ssl
- name: macOS arm64 debug
env:
CFLAGS: "-Wno-vla -mmacosx-version-min=10.9"
install_packages: nghttp2
configure: --without-ssl --enable-debug
- name: macOS arm64 libssh2
env:
CFLAGS: "-Wno-vla -mmacosx-version-min=10.9"
install_packages: nghttp2 libssh2
configure: --without-ssl --enable-debug --with-libssh2=/opt/homebrew/opt/libssh2
- name: macOS arm64 libssh-c-ares
env:
CFLAGS: "-Wno-vla -mmacosx-version-min=10.9"
install_packages: nghttp2 openssl libssh
configure: --enable-debug --with-openssl=/opt/homebrew/opt/openssl --with-libssh --enable-ares
- name: macOS arm64 libssh
env:
CFLAGS: "-Wno-vla -mmacosx-version-min=10.9"
install_packages: nghttp2 openssl libssh
configure: --enable-debug --with-openssl=/opt/homebrew/opt/openssl --with-libssh
- name: macOS arm64 c-ares
env:
CFLAGS: "-Wno-vla -mmacosx-version-min=10.9"
install_packages: nghttp2
configure: --without-ssl --enable-debug --enable-ares
- name: macOS arm64 HTTP only
env:
CFLAGS: "-Wno-vla -mmacosx-version-min=10.15"
install_packages: nghttp2
configure: --enable-debug --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-libpsl --without-librtmp --without-libssh2 --without-nghttp2 --without-ntlm-auth --without-ssl --without-zlib
- name: macOS arm64 SecureTransport http2
env:
CFLAGS: "-Wno-vla -mmacosx-version-min=10.8"
install_packages: nghttp2
configure: --with-secure-transport
- name: macOS arm64 OpenSSL http2
env:
CFLAGS: "-Wno-vla -mmacosx-version-min=10.9"
install_packages: nghttp2 openssl
configure: --enable-debug --with-openssl=/opt/homebrew/opt/openssl
- name: macOS arm64 LibreSSL http2
env:
CFLAGS: "-Wno-vla -mmacosx-version-min=10.9"
install_packages: nghttp2 libressl
configure: --enable-debug --with-openssl=/opt/homebrew/opt/libressl
- name: macOS arm64 torture
env:
CFLAGS: "-Wno-vla -mmacosx-version-min=10.9"
install_packages: nghttp2 openssl
configure: --enable-debug --disable-shared --disable-threaded-resolver --with-openssl=/opt/homebrew/opt/openssl
TFLAGS: -n -t --shallow=25 !FTP
- name: macOS arm64 torture-ftp
env:
CFLAGS: "-Wno-vla -mmacosx-version-min=10.9"
install_packages: nghttp2 openssl
configure: --enable-debug --disable-shared --disable-threaded-resolver --with-openssl=/opt/homebrew/opt/openssl
TFLAGS: -n -t --shallow=20 FTP
env:
CIRRUS_CLONE_DEPTH: 10
MAKE_FLAGS: -j 4
CFLAGS: "-Wno-vla -mmacosx-version-min=10.9"
pkginstall_script:
- echo libtool autoconf automake pkg-config ${install_packages} | xargs -Ix -n1 echo brew '"x"' > /tmp/Brewfile
@ -165,6 +218,6 @@ macos_task:
compile_script:
- make V=1 && make V=1 examples && cd tests && make V=1
test_script:
- sudo make V=1 test-ci
- sudo -E make V=1 test-ci
install_script:
- sudo make V=1 install