From f98aa0c76a45b8dea047fd60d687c2d377a2df06 Mon Sep 17 00:00:00 2001 From: Lev Stipakov Date: Wed, 2 Nov 2022 17:15:36 +0200 Subject: [PATCH] vcpkg: use the latest versions of dependency ports By removing builin-baseline constraint, we force vcpkg to use latest versions of ports. As a side effect, this bumps OpenSSL to 3.0.7. While on it, update vcpkg commit in GHA. We also have to apply a workaround for GHA to make it use our vcpkg checkout instead of c:\vcpkg, see https://github.com/actions/runner-images/issues/6376 https://github.com/lukka/run-vcpkg/issues/170 Signed-off-by: Lev Stipakov Acked-by: Gert Doering 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 --- .github/workflows/build.yaml | 6 ++++-- src/openvpn/vcpkg.json | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) 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" + ] }