System : Optionally bundle OpenSSL on Linux (#7458)

This commit is contained in:
Magne Sjaastad
2021-03-05 09:56:05 +01:00
committed by GitHub
parent 7798aa4b25
commit 0377da8097
4 changed files with 55 additions and 21 deletions

View File

@@ -127,7 +127,7 @@ jobs:
uses: lukka/set-shell-env@master
with:
VCPKGRESPONSEFILE: ${{ github.workspace }}/${{ matrix.config.vcpkg-response-file }}
- name: Run vcpkg
- name: Restore from cache and install vcpkg
uses: lukka/run-vcpkg@v5
id: runvcpkg
with:
@@ -136,6 +136,18 @@ jobs:
# Ensure the cache key changes any time the content of the response file changes.
appendedCacheKey: ${{ hashFiles(env.VCPKGRESPONSEFILE) }}
- name: Cache dynamic version of OpenSSL (Linux)
if: "contains( matrix.config.os, 'ubuntu')"
uses: actions/cache@v2
with:
path: ${{ github.workspace }}/ThirdParty/vcpkg/installed/x64-linux-dynamic
key: ${{ matrix.config.os }}-vcpkg-x64-linux-dynamic_v01
- name: Install dynamic version of OpenSSL (Linux)
if: "contains( matrix.config.os, 'ubuntu')"
run: |
$VCPKG_ROOT/vcpkg install --overlay-triplets=${{ github.workspace }}/ThirdParty/vcpkg-custom-triplets --triplet x64-linux-dynamic openssl
- name: Configure
shell: cmake -P {0}
run: |

View File

@@ -143,7 +143,6 @@ jobs:
-D CMAKE_BUILD_TYPE=$ENV{BUILD_TYPE}
-D CMAKE_INSTALL_PREFIX=cmakebuild/install
-D RESINSIGHT_ENABLE_UNITY_BUILD=true
-D RESINSIGHT_BUNDLE_OPENSSL=true
-D RESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS=true
-D RESINSIGHT_TREAT_WARNINGS_AS_ERRORS=true
-D RESINSIGHT_ENABLE_GRPC=true