Skip to content

Commit

Permalink
fix SSL type
Browse files Browse the repository at this point in the history
  • Loading branch information
Lyoko-Jeremie committed Aug 20, 2023
1 parent 59863b2 commit ec90a50
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/cmake-multi-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ jobs:
- build_mode: MINI_BUILD_MODE
cmake_build_mode_string: "-DMINI_BUILD_MODE=ON"
- ssl_type: StaticSSL
cmake_ssl_type_string: "-DUSE_DYNAMIC_BOOST=OFF"
cmake_ssl_type_string: "-DOPENSSL_USE_STATIC_LIBS=ON"
- ssl_type: DynamicSSL
cmake_ssl_type_string: "-DUSE_DYNAMIC_BOOST=ON"
cmake_ssl_type_string: "-DOPENSSL_USE_STATIC_LIBS=OFF"
exclude:
- os: windows-latest
c_compiler: gcc
Expand Down Expand Up @@ -91,6 +91,7 @@ jobs:
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-DUSE_DYNAMIC_BOOST=OFF
${{ matrix.cmake_build_mode_string }}
${{ matrix.cmake_ssl_type_string }}
-DBoost_INCLUDE_DIR=${{steps.install-boost.outputs.BOOST_ROOT}}/include
Expand Down Expand Up @@ -158,7 +159,7 @@ jobs:
# path: ${{ steps.strings.outputs.build-output-dir }}


- name: OpenSSL DLL (Win)
- name: OpenSSL DLL (Win DynamicSSL)
# https://github.com/orgs/community/discussions/27152
# https://github.com/actions/runner/issues/409
if: ${{ (runner.os == 'Windows') && (matrix.ssl_type == 'DynamicSSL') }}
Expand All @@ -169,7 +170,7 @@ jobs:
destBase: ${{ steps.strings.outputs.build-output-dir }}/Release/
target: ${{ steps.strings.outputs.build-output-dir }}/Release/

- name: Upload EXE (Win)
- name: Upload EXE (Win DynamicSSL)
if: ${{ (runner.os == 'Windows') && (matrix.ssl_type == 'DynamicSSL') }}
uses: actions/upload-artifact@v3
with:
Expand All @@ -180,7 +181,7 @@ jobs:
${{ steps.strings.outputs.build-output-dir }}/Release/html
${{ steps.strings.outputs.build-output-dir }}/Release/*.dll
- name: Upload EXE (Win)
- name: Upload EXE (Win StaticSSL)
if: ${{ (runner.os == 'Windows') && (matrix.ssl_type == 'StaticSSL') }}
uses: actions/upload-artifact@v3
with:
Expand Down

0 comments on commit ec90a50

Please sign in to comment.