From 253a87dccf8c9645fade2426177489fcd8dd0ec8 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Thu, 30 Mar 2023 12:15:36 +0200 Subject: [PATCH] vcpkg: request "tools" feature of openssl for MSVC build We need this for the MSI build. Previously this was enabled by default. Signed-off-by: Frank Lichtenheld Acked-by: Lev Stipakov Message-Id: <20230330101536.533080-1-frank@lichtenheld.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26561.html Signed-off-by: Gert Doering (cherry picked from commit b1fc3f25bc27462100bf96d9b677d6a3c31d3303) --- .github/workflows/build.yaml | 2 +- src/openvpn/vcpkg.json | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 99ae437e..4766efdc 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -440,7 +440,7 @@ jobs: - name: Restore artifacts, or setup vcpkg (do not install any package) uses: lukka/run-vcpkg@v10 with: - vcpkgGitCommitId: 'cafd398be781144787573ca78390e951673c7055' + vcpkgGitCommitId: 'd10d511f25620ca0f315cd83dcef6485efc63010' appendedCacheKey: '${{matrix.triplet}}' - name: Run MSBuild consuming vcpkg.json diff --git a/src/openvpn/vcpkg.json b/src/openvpn/vcpkg.json index 80645677..0afd802c 100644 --- a/src/openvpn/vcpkg.json +++ b/src/openvpn/vcpkg.json @@ -3,7 +3,10 @@ "name": "openvpn", "version": "2.6", "dependencies": [ - "openssl", + { + "name": "openssl", + "features": ["tools"] + }, "tap-windows6", "lzo", "lz4",