diff options
| author | Azat Khuzhin <azat@libevent.org> | 2022-07-09 21:17:06 +0300 |
|---|---|---|
| committer | Azat Khuzhin <azat@libevent.org> | 2022-07-09 21:17:06 +0300 |
| commit | acb7ef9819c3fe8b3c52e01c2c89b47fbc38b25d (patch) | |
| tree | 53be15ab64e75dcc861dc90a774a31e2a3573f17 /.github | |
| parent | 8bcbec77dd7e5f6d6958130752e099931002b6a5 (diff) | |
| download | libevent-acb7ef9819c3fe8b3c52e01c2c89b47fbc38b25d.tar.gz | |
ci/macos: remove separate openssl 1.1 from build matrix
@ploxiln:
On current homebrew, openssl@1.1 is the only openssl:
[pierce@plo-mbp15 libevent]$ brew --prefix openssl
/usr/local/opt/openssl@1.1
[pierce@plo-mbp15 libevent]$ brew info openssl
openssl@1.1: stable 1.1.1g (bottled) [keg-only]
Cryptography and SSL/TLS Toolkit
@fanquake
Indeed. OpenSSL 1.0 was removed from homebew in Homebrew/homebrew-core#46876. Related discussion also in Homebrew/homebrew-core#46454.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/macos.yml | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index de3290d0..012922bd 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -35,7 +35,6 @@ jobs: - DISABLE_MM_REPLACEMENT - TEST_EXPORT_STATIC - TEST_EXPORT_SHARED - - OPENSSL_1_1 steps: - uses: actions/checkout@v2.0.0 @@ -52,12 +51,8 @@ jobs: - name: Build shell: bash run: | - if [ "${{ matrix.EVENT_MATRIX }}" == "OPENSSL_1_1" ]; then - export OPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 - else - # NOTE: cmake does not support autodetection of OPENSSL_ROOT_DIR via brew - export OPENSSL_ROOT_DIR=/usr/local/opt/openssl - fi + # NOTE: cmake does not support autodetection of OPENSSL_ROOT_DIR via brew + export OPENSSL_ROOT_DIR=/usr/local/opt/openssl if [ "${{ matrix.EVENT_MATRIX }}" == "DISABLE_OPENSSL" ]; then EVENT_CMAKE_OPTIONS="-DEVENT__DISABLE_OPENSSL=ON" @@ -128,7 +123,6 @@ jobs: - DISABLE_THREAD_SUPPORT - DISABLE_DEBUG_MODE - DISABLE_MM_REPLACEMENT - - OPENSSL_1_1 steps: - uses: actions/checkout@v2.0.0 @@ -145,9 +139,6 @@ jobs: - name: Build shell: bash run: | - if [ "${{ matrix.EVENT_MATRIX }}" == "OPENSSL_1_1" ]; then - export PKG_CONFIG_PATH="/usr/local/opt/openssl@1.1/lib/pkgconfig:$PKG_CONFIG_PATH" - fi export CPPFLAGS="-I/usr/local/opt/mbedtls@2/include" export LDFLAGS="-L/usr/local/opt/mbedtls@2/lib" |