From 65bdd6baec664c3d22260a43c8f633f30d238f50 Mon Sep 17 00:00:00 2001 From: Marc Hoersken Date: Sat, 15 Oct 2022 22:48:08 +0200 Subject: [PATCH] CI/cirrus: remove superfluous double-quotes and sudo Follow up to #9565 and #9677 Closes #9738 --- .cirrus.yml | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 2d298acf71..fba7a4e8dc 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -142,63 +142,64 @@ macos_task: matrix: - name: macOS arm64 normal env: - CFLAGS: "-Wno-vla -mmacosx-version-min=10.9" + 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" + 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" + CFLAGS: -Wno-vla -mmacosx-version-min=10.9 install_packages: nghttp2 libssh2 configure: --without-ssl --enable-debug --with-libssh2=/opt/homebrew/opt/libssh2 + TFLAGS: -n !SFTP !SCP - name: macOS arm64 libssh-c-ares env: - CFLAGS: "-Wno-vla -mmacosx-version-min=10.9" + 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" + 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" + 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" + 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" + 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" + 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" + 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" + 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" + 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 @@ -218,6 +219,6 @@ macos_task: compile_script: - make V=1 && make V=1 examples && cd tests && make V=1 test_script: - - sudo -E make V=1 test-ci + - make V=1 test-ci install_script: - - sudo make V=1 install + - sudo -H make V=1 install