From 4954b27bc0f3a48e04a1856b5f4c28a1496dcb01 Mon Sep 17 00:00:00 2001 From: Azat Khuzhin Date: Sat, 9 Jul 2022 18:41:39 +0300 Subject: [PATCH] ci: remove separate build for BREW_AUTODETECT_OPENSSL (use it by default) --- .github/workflows/macos.yml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 15ab34e0..484616c5 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -36,7 +36,6 @@ jobs: - TEST_EXPORT_STATIC - TEST_EXPORT_SHARED - OPENSSL_1_1 - - BREW_AUTODETECT_OPENSSL steps: - uses: actions/checkout@v2.0.0 @@ -53,13 +52,8 @@ jobs: - name: Build shell: bash run: | - if [ "${{ matrix.EVENT_MATRIX }}" == "BREW_AUTODETECT_OPENSSL" ]; then - # use autodetection via brew - : - elif [ "${{ matrix.EVENT_MATRIX }}" == "OPENSSL_1_1" ]; then + if [ "${{ 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 fi if [ "${{ matrix.EVENT_MATRIX }}" == "DISABLE_OPENSSL" ]; then @@ -132,7 +126,6 @@ jobs: - DISABLE_DEBUG_MODE - DISABLE_MM_REPLACEMENT - OPENSSL_1_1 - - BREW_AUTODETECT_OPENSSL steps: - uses: actions/checkout@v2.0.0 @@ -149,13 +142,8 @@ jobs: - name: Build shell: bash run: | - if [ "${{ matrix.EVENT_MATRIX }}" == "BREW_AUTODETECT_OPENSSL" ]; then - # use autodetection via brew - : - elif [ "${{ matrix.EVENT_MATRIX }}" == "OPENSSL_1_1" ]; then + if [ "${{ 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" fi export CPPFLAGS="-I/usr/local/opt/mbedtls@2/include" export LDFLAGS="-L/usr/local/opt/mbedtls@2/lib" -- 2.40.0