Skip to content

Commit

Permalink
vcpkg: use the latest versions of dependency ports
Browse files Browse the repository at this point in the history
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

 actions/runner-images#6376
 lukka/run-vcpkg#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>
  • Loading branch information
lstipakov authored and cron2 committed Nov 8, 2022
1 parent 036517d commit f98aa0c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/openvpn/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@
"lzo",
"lz4",
"pkcs11-helper"
],
"builtin-baseline": "9259a0719d94c402aae2ab7975bc096afdec15df"
]
}

0 comments on commit f98aa0c

Please sign in to comment.