]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
GHA/macos: switch 5 jobs from autotools to cmake
authorViktor Szakats <commit@vsz.me>
Tue, 6 Jan 2026 01:53:04 +0000 (02:53 +0100)
committerViktor Szakats <commit@vsz.me>
Tue, 6 Jan 2026 03:15:22 +0000 (04:15 +0100)
To save 0.5 to 3 minutes per job.

There remain 7 main autotools jobs, plus 1 in combinations and 1 more
for iOS.

Also:
- fix to disable MQTT, WebSockets, IPFS in HTTP-only job.

Closes #20193

.github/workflows/macos.yml

index 236585668b28365819d8cbe0576a78ce67772a57..7bec02f67174a57de1b05e71d86c6d6c9b5b2936 100644 (file)
@@ -233,7 +233,7 @@ jobs:
             tflags: '--min=950'
           - name: '!ssl'
             compiler: clang
-            configure: --enable-debug --without-ssl
+            generate: -DENABLE_DEBUG=ON -DCURL_ENABLE_SSL=OFF -DCURL_USE_LIBSSH2=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF
             tflags: '--min=1500'
           - name: '!ssl libssh2 AppleIDN'
             compiler: clang
@@ -246,29 +246,29 @@ jobs:
           - name: 'OpenSSL libssh'
             compiler: llvm@18
             install: libssh libnghttp3
-            configure: --enable-debug --with-libssh --with-openssl=/opt/homebrew/opt/openssl --with-openssl-quic
+            generate: -DENABLE_DEBUG=ON -DCURL_USE_LIBSSH2=OFF -DCURL_USE_LIBSSH=ON -DOPENSSL_ROOT_DIR=/opt/homebrew/opt/openssl -DUSE_OPENSSL_QUIC=ON -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF
           - name: '!ssl c-ares'
             compiler: clang
             configure: --enable-debug --enable-ares --without-ssl
             tflags: '--min=1500'
           - name: '!ssl HTTP-only'
             compiler: clang
-            tflags: '--min=950'
-            configure: >-
-              --enable-debug
-              --disable-alt-svc --disable-dict --disable-file --disable-ftp --disable-gopher --disable-imap
-              --disable-ldap --disable-pop3 --without-librtmp --disable-rtsp
-              --enable-static --disable-shared --disable-smb --disable-smtp --disable-telnet --disable-tftp --disable-unix-sockets
-              --without-brotli --without-gssapi --without-libidn2 --without-libpsl --without-librtmp
-              --without-libssh2 --without-libssh
-              --without-nghttp2 --disable-ntlm --without-ssl --without-zlib --without-zstd
+            tflags: '--min=930'
+            generate: >-
+              -DENABLE_DEBUG=ON
+              -DCURL_ENABLE_SSL=OFF -DHTTP_ONLY=ON -DCURL_DISABLE_WEBSOCKETS=ON
+              -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_ALTSVC=ON -DENABLE_UNIX_SOCKETS=OFF
+              -DCURL_USE_LIBSSH2=OFF -DCURL_USE_LIBSSH=OFF -DUSE_NGHTTP2=OFF
+              -DCURL_USE_GSSAPI=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DUSE_LIBRTMP=OFF
+              -DCURL_BROTLI=OFF -DCURL_ZLIB=OFF -DCURL_ZSTD=OFF
+              -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=OFF
 
             macos-version-min: '10.15'  # Catalina (2019)
           - name: 'LibreSSL !ldap +examples'
             compiler: clang
             install: libressl
             install_steps: pytest
-            configure: --enable-debug --with-openssl=/opt/homebrew/opt/libressl --disable-ldap
+            generate: -DENABLE_DEBUG=ON -DOPENSSL_ROOT_DIR=/opt/homebrew/opt/libressl -DCURL_DISABLE_LDAP=ON -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_USE_LIBSSH2=OFF
           - name: 'OpenSSL 10.15'
             compiler: clang
             install: libnghttp3 libngtcp2
@@ -282,7 +282,7 @@ jobs:
             configure: --enable-debug --with-openssl=/opt/homebrew/opt/openssl --with-ngtcp2 --with-apple-sectrust
           - name: 'OpenSSL event-based'
             compiler: clang
-            configure: --enable-debug --with-openssl=/opt/homebrew/opt/openssl
+            generate: -DENABLE_DEBUG=ON -DOPENSSL_ROOT_DIR=/opt/homebrew/opt/openssl -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_USE_LIBSSH2=OFF
             tflags: '--test-event --min=1300'
           # cmake
           - name: 'OpenSSL gsasl rtmp AppleIDN SecTrust +examples'