From: Pierce Lopez <pierce.lopez@gmail.com>
Date: Fri, 17 Sep 2021 05:37:19 +0000 (-0400)
Subject: ci: fix macOS mbedtls version/search
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bceab045ea8f4b421d1e3767f11d2b034153d96d;p=libevent

ci: fix macOS mbedtls version/search

mbedtls just updated to version 3.0, install mbedtls@2 variant,
which needs more help being located since it's no longer the
default and no longer linked into the typical /usr/local dirs

also gitignore mbedtls sample program binaries
---

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 5ce4b432..e1376445 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -48,7 +48,7 @@ jobs:
           key: macos-10.15-cmake-${{ matrix.EVENT_MATRIX }}-v3
 
       - name: Install Depends
-        run: brew install mbedtls
+        run: brew install mbedtls@2
 
       - name: Build And Test
         shell: bash
@@ -86,6 +86,7 @@ jobs:
           else
             EVENT_CMAKE_OPTIONS=""
           fi
+          EVENT_CMAKE_OPTIONS="$EVENT_CMAKE_OPTIONS -DMBEDTLS_ROOT_DIR=/usr/local/opt/mbedtls@2"
 
           #run build and test
           JOBS=1
@@ -137,7 +138,7 @@ jobs:
           key: ${{ matrix.os }}-autotools-${{ matrix.EVENT_MATRIX }}-v3
 
       - name: Install Depends
-        run: brew install autoconf automake libtool pkg-config mbedtls
+        run: brew install autoconf automake libtool pkg-config mbedtls@2
 
       - name: Build And Test
         shell: bash
@@ -150,6 +151,8 @@ jobs:
           else
             export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:$PKG_CONFIG_PATH"
           fi
+          export CPPFLAGS="-I/usr/local/opt/mbedtls@2/include"
+          export  LDFLAGS="-L/usr/local/opt/mbedtls@2/lib"
 
           if [ "${{ matrix.EVENT_MATRIX }}" == "DISABLE_OPENSSL" ]; then
             EVENT_CONFIGURE_OPTIONS="--disable-openssl"
diff --git a/.gitignore b/.gitignore
index e348d168..28bab0a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,6 +97,8 @@ http-server
 http-connect
 le-proxy
 https-client
+https-client-mbedtls
+ssl-client-mbedtls
 signal-test
 time-test
 event-test