aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorLev Stipakov2022-11-02 17:15:36 +0200
committerGert Doering2022-11-08 14:02:45 +0100
commitf98aa0c76a45b8dea047fd60d687c2d377a2df06 (patch)
tree62eb593c6fa96e40ae5be384efb3cfd2c0a171d8 /.github
parent036517d5e06c1254233d51893b3a196a3cd37492 (diff)
downloadopenvpn-f98aa0c76a45b8dea047fd60d687c2d377a2df06.zip
openvpn-f98aa0c76a45b8dea047fd60d687c2d377a2df06.tar.gz
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>
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/build.yaml6
1 files changed, 4 insertions, 2 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f7d2d38..2db90bc 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