From 5c989b6a643011ca5e1c6d7db8ff159b0991cc0e Mon Sep 17 00:00:00 2001
From: luca <681992+lukka@users.noreply.github.com>
Date: Sun, 29 Mar 2020 23:24:03 -0700
Subject: [PATCH] use run-vcpkg@v1 and run-cmake@v1

---
 .github/workflows/main.yml | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 38c9cf35e4..11eeec0af7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -39,27 +39,20 @@ jobs:
           # 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.vcpkg-response-file )) }}-${{ hashFiles('.git/modules/vcpkg/HEAD') }}-${{ runner.os }}
       - name: Run vcpkg
-        uses: lukka/run-vcpkg@v0
+        uses: lukka/run-vcpkg@v1
         id: runvcpkg
         with:
           vcpkgArguments: '@${{ github.workspace }}/${{ matrix.vcpkg-response-file }}'
           vcpkgDirectory: '${{ github.workspace }}/vcpkg'
-      - name: Prints outputs of run-vcpkg task
-        run: echo "'${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}' '${{  steps.runvcpkg.outputs.RUNVCPKG_VCPKG_TRIPLET_OUT }}' "
-      - name: (Windows) Build ResInsight-x64 
-        if: "contains( matrix.os, 'windows')"
-        run: |
-          mkdir cmakebuild
-          cd cmakebuild
-          cmake .. -DRESINSIGHT_ENABLE_GRPC=true -DRESINSIGHT_GRPC_PYTHON_EXECUTABLE=python -DRESINSIGHT_ENABLE_PRECOMPILED_HEADERS=true -DRESINSIGHT_ENABLE_UNITY_BUILD=true -DRESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS=true -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake -A x64
-          cmake --build . --config Release --target PACKAGE
-      - name: (Linux) Build ResInsight-x64 
-        if: "!contains( matrix.os, 'windows')"
-        run: |
-          mkdir cmakebuild
-          cd cmakebuild
-          cmake .. -DRESINSIGHT_ENABLE_GRPC=true -DRESINSIGHT_GRPC_PYTHON_EXECUTABLE=python -DRESINSIGHT_ENABLE_PRECOMPILED_HEADERS=true -DRESINSIGHT_ENABLE_UNITY_BUILD=true -DRESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS=true -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
-          cmake --build . --config Release --target package
+      - name: Build ResInsight-x64
+        uses: lukka/run-cmake@v1
+        with:
+          cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
+          cmakeAppendedArgs:  '-DRESINSIGHT_ENABLE_GRPC=true -DRESINSIGHT_GRPC_PYTHON_EXECUTABLE=python -DRESINSIGHT_ENABLE_PRECOMPILED_HEADERS=true -DRESINSIGHT_ENABLE_UNITY_BUILD=true -DRESINSIGHT_INCLUDE_APPLICATION_UNIT_TESTS=true'
+          buildDirectory: ${{ github.workspace }}/cmakebuild
+          buildWithCMakeArgs: '--config Release --target package'
+          useVcpkgToolchainFile: true
+        continue-on-error: true
       - name: Remove packages/_CPack_Packages
         shell: bash
         run: |