From: Azat Khuzhin Date: Sun, 1 Nov 2020 21:39:26 +0000 (+0300) Subject: Add autodetection of openssl via brew into build matrix X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29b1404ba215974692abb5dcac757b65a095699f;p=libevent Add autodetection of openssl via brew into build matrix --- diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 4c98c320..5ce4b432 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -36,6 +36,7 @@ jobs: - TEST_EXPORT_STATIC - TEST_EXPORT_SHARED - OPENSSL_1_1 + - BREW_AUTODETECT_OPENSSL steps: - uses: actions/checkout@v2.0.0 @@ -52,7 +53,10 @@ jobs: - name: Build And Test shell: bash run: | - if [ "${{ matrix.EVENT_MATRIX }}" == "OPENSSL_1_1" ]; then + if [ "${{ matrix.EVENT_MATRIX }}" == "BREW_AUTODETECT_OPENSSL" ]; then + # use autodetection via brew + : + elif [ "${{ matrix.EVENT_MATRIX }}" == "OPENSSL_1_1" ]; then export OPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 else export OPENSSL_ROOT_DIR=/usr/local/opt/openssl @@ -121,6 +125,7 @@ jobs: - DISABLE_DEBUG_MODE - DISABLE_MM_REPLACEMENT - OPENSSL_1_1 + - BREW_AUTODETECT_OPENSSL steps: - uses: actions/checkout@v2.0.0 @@ -137,7 +142,10 @@ jobs: - name: Build And Test shell: bash run: | - if [ "${{ matrix.EVENT_MATRIX }}" == "OPENSSL_1_1" ]; then + if [ "${{ matrix.EVENT_MATRIX }}" == "BREW_AUTODETECT_OPENSSL" ]; then + # use autodetection via brew + : + elif [ "${{ matrix.EVENT_MATRIX }}" == "OPENSSL_1_1" ]; then export PKG_CONFIG_PATH="/usr/local/opt/openssl@1.1/lib/pkgconfig:$PKG_CONFIG_PATH" else export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:$PKG_CONFIG_PATH"