mirror of
https://github.com/OpenVPN/openvpn.git
synced 2026-05-28 04:03:29 -04:00
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 <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>
This commit is contained in:
parent
036517d5e0
commit
f98aa0c76a
2 changed files with 5 additions and 4 deletions
6
.github/workflows/build.yaml
vendored
6
.github/workflows/build.yaml
vendored
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -8,6 +8,5 @@
|
|||
"lzo",
|
||||
"lz4",
|
||||
"pkcs11-helper"
|
||||
],
|
||||
"builtin-baseline": "9259a0719d94c402aae2ab7975bc096afdec15df"
|
||||
]
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue