Message ID | 20221102151536.255-1-lstipakov@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [Openvpn-devel] vcpkg: use the latest versions of dependency ports | expand |
Acked-by: Gert Doering <gert@greenie.muc.de> As usual, I have no idea what this all does, but is not changing code, and seems to match the commit description (which sounds reasonable). Your patch has been applied to the master branch. commit f98aa0c76a45b8dea047fd60d687c2d377a2df06 Author: Lev Stipakov Date: Wed Nov 2 17:15:36 2022 +0200 vcpkg: use the latest versions of dependency ports Signed-off-by: Lev Stipakov <lev@openvpn.net> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <20221102151536.255-1-lstipakov@gmail.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg25474.html Signed-off-by: Gert Doering <gert@greenie.muc.de> -- kind regards, Gert Doering
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f7d2d383..2db90bcd 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -342,13 +342,15 @@ jobs: - name: Restore artifacts, or setup vcpkg (do not install any package) uses: lukka/run-vcpkg@v10 with: - vcpkgGitCommitId: '9259a0719d94c402aae2ab7975bc096afdec15df' + vcpkgGitCommitId: 'cafd398be781144787573ca78390e951673c7055' appendedCacheKey: '${{matrix.triplet}}' - name: Run MSBuild consuming vcpkg.json working-directory: ${{env.GITHUB_WORKSPACE}} run: | - vcpkg integrate install + # workaround for GHA runner bug where vcpkg installation is detected at c:\vcpkg + # see https://github.com/lukka/run-vcpkg/issues/170 + ${{ github.workspace }}/vcpkg/vcpkg.exe integrate install msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform="${{ matrix.plat }}" . - name: Archive artifacts diff --git a/src/openvpn/vcpkg.json b/src/openvpn/vcpkg.json index 40db1fd2..80645677 100644 --- a/src/openvpn/vcpkg.json +++ b/src/openvpn/vcpkg.json @@ -8,6 +8,5 @@ "lzo", "lz4", "pkcs11-helper" - ], - "builtin-baseline": "9259a0719d94c402aae2ab7975bc096afdec15df" + ] }