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

Fix action following move of vcpkg

Browse Source
This commit is contained in:
Gaute Lindkvist 2020-09-24 17:22:14 +02:00
parent 18d250ebf1
commit 43186453e5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ jobs:
environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat", environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
vcpkg-response-file: vcpkg_x64-windows.txt, vcpkg-response-file: vcpkg_x64-windows.txt,
vcpkg-triplet: x64-windows, vcpkg-triplet: x64-windows,
cmake-toolchain: 'vcpkg/scripts/buildsystems/vcpkg.cmake' cmake-toolchain: 'ThirdParty/vcpkg/scripts/buildsystems/vcpkg.cmake'
} }
- { - {
name: "Ubuntu Latest GCC", name: "Ubuntu Latest GCC",
@ -34,7 +34,7 @@ jobs:
cc: "gcc", cxx: "g++", cc: "gcc", cxx: "g++",
vcpkg-response-file: vcpkg_x64-linux.txt, vcpkg-response-file: vcpkg_x64-linux.txt,
vcpkg-triplet: x64-linux, vcpkg-triplet: x64-linux,
cmake-toolchain: 'vcpkg/scripts/buildsystems/vcpkg.cmake' cmake-toolchain: 'ThirdParty/vcpkg/scripts/buildsystems/vcpkg.cmake'
} }
- { - {
name: "Ubuntu 20.04", name: "Ubuntu 20.04",
@ -42,7 +42,7 @@ jobs:
cc: "gcc", cxx: "g++", cc: "gcc", cxx: "g++",
vcpkg-response-file: vcpkg_x64-linux.txt, vcpkg-response-file: vcpkg_x64-linux.txt,
vcpkg-triplet: x64-linux, vcpkg-triplet: x64-linux,
cmake-toolchain: 'vcpkg/scripts/buildsystems/vcpkg.cmake' cmake-toolchain: 'ThirdParty/vcpkg/scripts/buildsystems/vcpkg.cmake'
} }
- { - {
name: "Ubuntu 20.04 clang", name: "Ubuntu 20.04 clang",
@ -50,7 +50,7 @@ jobs:
cc: "clang", cxx: "clang++", cc: "clang", cxx: "clang++",
vcpkg-response-file: vcpkg_x64-linux.txt, vcpkg-response-file: vcpkg_x64-linux.txt,
vcpkg-triplet: x64-linux, vcpkg-triplet: x64-linux,
cmake-toolchain: 'vcpkg/scripts/buildsystems/vcpkg.cmake' cmake-toolchain: 'ThirdParty/vcpkg/scripts/buildsystems/vcpkg.cmake'
} }
steps: steps:
- name: Checkout - name: Checkout
@ -124,15 +124,15 @@ jobs:
- name: Cache vcpkg artifacts - name: Cache vcpkg artifacts
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ${{ github.workspace }}/vcpkg/ path: ${{ github.workspace }}/ThirdParty/vcpkg/
# Ensure the cache is invalidated any time vcpkg version changes, or a different set of packages is being used. # Ensure the cache is invalidated any time vcpkg version changes, or a different set of packages is being used.
key: ${{ hashFiles( format('{0}/{1}', github.workspace, matrix.config.vcpkg-response-file )) }}-${{ hashFiles('.git/modules/vcpkg/HEAD') }}-${{ runner.os }}-v02 key: ${{ hashFiles( format('{0}/{1}', github.workspace, matrix.config.vcpkg-response-file )) }}-${{ hashFiles('.git/modules/ThirdParty/vcpkg/HEAD') }}-${{ runner.os }}-v02
- name: Run vcpkg - name: Run vcpkg
uses: lukka/run-vcpkg@v1 uses: lukka/run-vcpkg@v1
id: runvcpkg id: runvcpkg
with: with:
vcpkgArguments: '@${{ github.workspace }}/${{ matrix.config.vcpkg-response-file }}' vcpkgArguments: '@${{ github.workspace }}/${{ matrix.config.vcpkg-response-file }}'
vcpkgDirectory: '${{ github.workspace }}/vcpkg' vcpkgDirectory: '${{ github.workspace }}/ThirdParty/vcpkg'
- name: Configure - name: Configure
shell: cmake -P {0} shell: cmake -P {0}
run: | run: |