OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update vcpkg

Browse Source 
Update vcpkg to be compatible with OSX
This commit is contained in:
Magne Sjaastad 2021-04-05 08:23:40 -07:00 committed by GitHub
parent eea2356459
commit 6e45d51e4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ResInsightWithCache.yml vendored
View File

@ -134,14 +134,14 @@ jobs:
vcpkgArguments: '@${{ github.workspace }}/${{ matrix.config.vcpkg-response-file }}' vcpkgArguments: '@${{ github.workspace }}/${{ matrix.config.vcpkg-response-file }}'
vcpkgDirectory: '${{ github.workspace }}/ThirdParty/vcpkg' vcpkgDirectory: '${{ github.workspace }}/ThirdParty/vcpkg'
# Ensure the cache key changes any time the content of the response file changes. # Ensure the cache key changes any time the content of the response file changes.
appendedCacheKey: ${{ hashFiles(env.VCPKGRESPONSEFILE) }} appendedCacheKey: ${{ hashFiles(env.VCPKGRESPONSEFILE) }}-v01
- name: Cache dynamic version of OpenSSL (Linux) - name: Cache dynamic version of OpenSSL (Linux)
if: "contains( matrix.config.os, 'ubuntu')" if: "contains( matrix.config.os, 'ubuntu')"
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ${{ github.workspace }}/ThirdParty/vcpkg/installed/x64-linux-dynamic path: ${{ github.workspace }}/ThirdParty/vcpkg/installed/x64-linux-dynamic
key: ${{ matrix.config.os }}-vcpkg-x64-linux-dynamic_v01 key: ${{ matrix.config.os }}-vcpkg-x64-linux-dynamic_v04
- name: Install dynamic version of OpenSSL (Linux) - name: Install dynamic version of OpenSSL (Linux)
if: "contains( matrix.config.os, 'ubuntu')" if: "contains( matrix.config.os, 'ubuntu')"

2
.gitmodules vendored
View File

@ -3,4 +3,4 @@
url = https://github.com/CeetronSolutions/qwt.git url = https://github.com/CeetronSolutions/qwt.git
[submodule "ThirdParty/vcpkg"] [submodule "ThirdParty/vcpkg"]
path = ThirdParty/vcpkg path = ThirdParty/vcpkg
url = https://github.com/microsoft/vcpkg url = https://github.com/CeetronSolutions/vcpkg

2
ThirdParty/vcpkg vendored

@ -1 +1 @@
Subproject commit 56fffbe49dfb4dd8fae0940f272c5fd2b86be991 Subproject commit d9a0634166af9e0cc7d915e711d87a5bd190b41c