diff --git a/.github/workflows/ResInsightWithCache.yml b/.github/workflows/ResInsightWithCache.yml index 2504ec4470..718bf9de9e 100644 --- a/.github/workflows/ResInsightWithCache.yml +++ b/.github/workflows/ResInsightWithCache.yml @@ -187,11 +187,6 @@ jobs: core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); - - name: Replace and use vcpkg.json without grpc - if: contains( matrix.config.os, 'windows') - run: | - cp vcpkg_no_grpc.json vcpkg.json - - name: vcpkg bootstrap run: | ThirdParty/vcpkg/${{ matrix.config.vcpkg-bootstrap }} diff --git a/.gitmodules b/.gitmodules index 90447290d1..10a49192b7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ url = https://github.com/CeetronSolutions/qwt.git [submodule "ThirdParty/vcpkg"] path = ThirdParty/vcpkg - url = https://github.com/microsoft/vcpkg + url = https://github.com/CeetronSolutions/vcpkg [submodule "ThirdParty/custom-opm-common/opm-common"] path = ThirdParty/custom-opm-common/opm-common url = https://github.com/CeetronSolutions/opm-common diff --git a/ThirdParty/vcpkg b/ThirdParty/vcpkg index cf035d9916..04bec276db 160000 --- a/ThirdParty/vcpkg +++ b/ThirdParty/vcpkg @@ -1 +1 @@ -Subproject commit cf035d9916a0a23042b41fcae7ee0386d245af08 +Subproject commit 04bec276dbdaddc30f629062a7e3b235d2d13136