From: Azat Khuzhin <azat@libevent.org>
Date: Mon, 14 Sep 2020 18:30:02 +0000 (+0300)
Subject: Add build w/o any SSL support (i.e. w/o openssl and mbedtls)
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7d3cd403f29addecb35d2c0af23378c3ece2b46;p=libevent

Add build w/o any SSL support (i.e. w/o openssl and mbedtls)

This pure build w/o SSL has been removed in mbedtls PR - #1028
---

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index c8834623..12bc67cc 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -29,6 +29,7 @@ jobs:
         EVENT_MATRIX:
           - DIST
           - NONE
+          - NO_SSL
           - DISABLE_OPENSSL
           - DISABLE_THREAD_SUPPORT
           - DISABLE_DEBUG_MODE
@@ -78,6 +79,8 @@ jobs:
 
           if [ "${{ matrix.EVENT_MATRIX }}" == "DISABLE_OPENSSL" ]; then
             EVENT_CMAKE_OPTIONS="-DEVENT__DISABLE_OPENSSL=ON"
+          elif [ "${{ matrix.EVENT_MATRIX }}" == "NO_SSL" ]; then
+            EVENT_CMAKE_OPTIONS="-DEVENT__DISABLE_OPENSSL=ON -DEVENT__DISABLE_MBEDTLS=ON"
           elif [ "${{ matrix.EVENT_MATRIX }}" == "DISABLE_THREAD_SUPPORT" ]; then
             EVENT_CMAKE_OPTIONS="-DEVENT__DISABLE_THREAD_SUPPORT=ON"
           elif [ "${{ matrix.EVENT_MATRIX }}" == "DISABLE_DEBUG_MODE" ]; then
@@ -139,6 +142,7 @@ jobs:
         EVENT_MATRIX:
           - DIST
           - NONE
+          - NO_SSL
           - DISABLE_OPENSSL
           - DISABLE_THREAD_SUPPORT
           - DISABLE_DEBUG_MODE
@@ -169,6 +173,9 @@ jobs:
           if [ "${{ matrix.EVENT_MATRIX }}" == "DISABLE_OPENSSL" ]; then
             EVENT_CONFIGURE_OPTIONS="--disable-openssl"
 
+          elif [ "${{ matrix.EVENT_MATRIX }}" == "NO_SSL" ]; then
+            EVENT_CONFIGURE_OPTIONS="--disable-openssl --disable-mbedtls"
+
           elif [ "${{ matrix.EVENT_MATRIX }}" == "DISABLE_THREAD_SUPPORT" ]; then
             EVENT_CONFIGURE_OPTIONS="--disable-thread-support"
 
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index ec7c9cf6..4c98c320 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -28,6 +28,7 @@ jobs:
         os: [macos-latest]
         EVENT_MATRIX:
           - NONE
+          - NO_SSL
           - DISABLE_OPENSSL
           - DISABLE_THREAD_SUPPORT
           - DISABLE_DEBUG_MODE
@@ -60,6 +61,9 @@ jobs:
           if [ "${{ matrix.EVENT_MATRIX }}" == "DISABLE_OPENSSL" ]; then
             EVENT_CMAKE_OPTIONS="-DEVENT__DISABLE_OPENSSL=ON"
 
+          elif [ "${{ matrix.EVENT_MATRIX }}" == "NO_SSL" ]; then
+            EVENT_CMAKE_OPTIONS="-DEVENT__DISABLE_OPENSSL=ON -DEVENT__DISABLE_MBEDTLS=ON"
+
           elif [ "${{ matrix.EVENT_MATRIX }}" == "DISABLE_THREAD_SUPPORT" ]; then
             EVENT_CMAKE_OPTIONS="-DEVENT__DISABLE_THREAD_SUPPORT=ON"
 
@@ -111,6 +115,7 @@ jobs:
         os: [macos-latest]
         EVENT_MATRIX:
           - NONE
+          - NO_SSL
           - DISABLE_OPENSSL
           - DISABLE_THREAD_SUPPORT
           - DISABLE_DEBUG_MODE
@@ -141,6 +146,9 @@ jobs:
           if [ "${{ matrix.EVENT_MATRIX }}" == "DISABLE_OPENSSL" ]; then
             EVENT_CONFIGURE_OPTIONS="--disable-openssl"
 
+          elif [ "${{ matrix.EVENT_MATRIX }}" == "NO_SSL" ]; then
+            EVENT_CONFIGURE_OPTIONS="--disable-openssl --disable-mbedtls"
+
           elif [ "${{ matrix.EVENT_MATRIX }}" == "DISABLE_THREAD_SUPPORT" ]; then
             EVENT_CONFIGURE_OPTIONS="--disable-thread-support"
 
diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
index 16e673d0..cadae0be 100644
--- a/.github/workflows/mingw.yml
+++ b/.github/workflows/mingw.yml
@@ -27,6 +27,7 @@ jobs:
       matrix:
         EVENT_MATRIX:
           - none
+          - no-ssl
           - disable-openssl
           - disable-thread-support
           - disable-debug-mode
@@ -50,7 +51,10 @@ jobs:
         shell: powershell
         run: |
           $env:EVENT_CONFIGURE_OPTIONS=""
-          if ( "${{ matrix.EVENT_MATRIX }}" -ne "none" ) {
+          if ( "${{ matrix.EVENT_MATRIX }}" -eq "no-ssl" ) {
+            $env:EVENT_CONFIGURE_OPTIONS="--disable-openssl --disable-mbedtls"
+          }
+          elseif ( "${{ matrix.EVENT_MATRIX }}" -ne "none" ) {
             $env:EVENT_CONFIGURE_OPTIONS="--${{ matrix.EVENT_MATRIX }}"
           }
           $env:EVENT_TESTS_PARALLEL=1
@@ -84,6 +88,7 @@ jobs:
       matrix:
         EVENT_MATRIX:
           - NONE
+          - NO_SSL
           - DISABLE_OPENSSL
           - DISABLE_THREAD_SUPPORT
           - DISABLE_DEBUG_MODE
@@ -108,7 +113,10 @@ jobs:
         shell: powershell
         run: |
           $EVENT_CONFIGURE_OPTIONS=""
-          if ( "${{ matrix.EVENT_MATRIX }}" -ne "NONE" ) {
+          if ( "${{ matrix.EVENT_MATRIX }}" -ne "NO_SSL" ) {
+            $EVENT_CONFIGURE_OPTIONS="-DEVENT__DISABLE_OPENSSL=ON -DEVENT__DISABLE_MBEDTLS=ON"
+          }
+          elseif ( "${{ matrix.EVENT_MATRIX }}" -ne "NONE" ) {
             $EVENT_CONFIGURE_OPTIONS="-DEVENT__${{ matrix.EVENT_MATRIX }}=ON"
           }
           $env:PATH="D:\a\_temp\msys\msys64\mingw64\bin;D:\a\_temp\msys\msys64\usr\bin;$env:PATH"
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 57f010c8..99138b4c 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -118,6 +118,7 @@ jobs:
         os: [windows-2019]
         EVENT_MATRIX:
           - NONE
+          - NO_SSL
           - LIBRARY_TYPE_STATIC
           - DISABLE_OPENSSL
           - DISABLE_THREAD_SUPPORT
@@ -175,6 +176,9 @@ jobs:
           elseif ( "${{ matrix.EVENT_MATRIX }}" -eq "TEST_EXPORT_STATIC" ) {
             $EVENT_CMAKE_OPTIONS="-DEVENT__LIBRARY_TYPE=STATIC -DEVENT__MSVC_STATIC_RUNTIME=OFF -DEVENT__DISABLE_TESTS=ON -DEVENT__DISABLE_SAMPLES=ON"
           }
+          elseif ( "${{ matrix.EVENT_MATRIX }}" -eq "NO_SSL" ) {
+            $EVENT_CMAKE_OPTIONS="-DEVENT__DISABLE_OPENSSL=ON -DEVENT__DISABLE_MBEDTLS=ON"
+          }
           else {
             $EVENT_CMAKE_OPTIONS=""
           }