From: Francesco Chemolli <5175948+kinkie@users.noreply.github.com>
Date: Tue, 25 Jun 2024 23:03:16 +0000 (+0000)
Subject: CI: Use packages from GitHub Actions MacOS runner base-image (#1850)
X-Git-Tag: SQUID_7_0_1~100
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e68abfced2e7c3e0af36fa74939489a1c7071e7d;p=thirdparty%2Fsquid.git

CI: Use packages from GitHub Actions MacOS runner base-image (#1850)

    openldap 2.6.8 is already installed and up-to-date.
    openssl@3 3.3.1 is already installed and up-to-date.

Do not "brew install" openldap and openssl packages to avoid GitHub
Actions warnings. If GitHub stops pre-installing these packages, then
MacOS tests will fail because Squid is not compatible with MacOS's
native frameworks for LDAP and OpenSSL.

Also fix an indentation error.
---

diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml
index f038c03375..d9db83abb2 100644
--- a/.github/workflows/default.yaml
+++ b/.github/workflows/default.yaml
@@ -105,8 +105,8 @@ jobs:
           - { name: layer-01-minimal, nick: minimal }
           - { name: layer-02-maximus, nick: maximus }
         exclude:
-            # Non-clang testing on MacOS is too much work for very little gain
-            - { os: macos-14, compiler: { CC: gcc, CXX: g++ } }
+          # Non-clang testing on MacOS is too much work for very little gain
+          - { os: macos-14, compiler: { CC: gcc, CXX: g++ } }
 
     runs-on: ${{ matrix.os }}
 
@@ -133,7 +133,8 @@ jobs:
           brew install \
             automake coreutils cppunit gawk \
             gnu-getopt gnu-sed grep libtool \
-            make openldap openssl cyrus-sasl
+            make cyrus-sasl
+            # openldap openssl # already provided by github workers base-image
 
       - name: Checkout sources
         uses: actions/checkout@v4