From: Viktor Szakats <commit@vsz.me>
Date: Tue, 20 Aug 2024 21:42:01 +0000 (+0200)
Subject: GHA/macos: enable brotli and zstd in autotools and cmake jobs
X-Git-Tag: curl-8_10_0~179
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e9056f8b1fc38a2ab678ea04954570daff3a465;p=thirdparty%2Fcurl.git

GHA/macos: enable brotli and zstd in autotools and cmake jobs

They were missing from macOS builds:
https://testclutch.curl.se/static/reports/feature-matrix.html

Closes #14619
---

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 30f1144e40..96ea83df96 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -68,9 +68,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: '!ssl !debug'
+          - name: '!ssl !debug brotli zstd'
             compiler: clang
-            configure: --without-ssl --enable-websockets
+            install: brotli zstd
+            configure: --without-ssl --enable-websockets --with-brotli --with-zstd
             macos-version-min: '10.9'
           - name: '!ssl !debug'
             compiler: gcc-12
@@ -287,9 +288,9 @@ jobs:
             install: libressl heimdal
             generate: -DOPENSSL_ROOT_DIR=$(brew --prefix libressl) -DENABLE_ARES=ON -DCURL_USE_GSSAPI=ON -DGSS_ROOT_DIR=$(brew --prefix heimdal) -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON -DBUILD_EXAMPLES=ON
             macos-version-min: '10.15'
-          - name: 'wolfSSL !ldap'
-            install: wolfssl
-            generate: -DCURL_USE_WOLFSSL=ON -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON
+          - name: 'wolfSSL !ldap brotli zstd'
+            install: brotli wolfssl zstd
+            generate: -DCURL_USE_WOLFSSL=ON -DCURL_BROTLI=ON -DCURL_ZSTD=ON -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON
             macos-version-min: '10.15'
           - name: 'GnuTLS !ldap krb5'
             install: gnutls nettle krb5