Skip to contentSkip to conversation

vcpkg: use the latest versions of dependency ports

PATCH In review Lev Stipakov 2 participants 2 messages Nov 2, 2022 – Nov 8, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 vcpkg: use the latest versions of dependency ports

From: Lev Stipakov <[email protected]...>

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

---
 .github/workflows/build.yaml | 6 ++++--
 src/openvpn/vcpkg.json       | 3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)
.github/workflows/build.yaml +4 -2
index f7d2d383..2db90bcd 100644
@@ -342,13 +342,15 @@ jobs:
       - name: Restore artifacts, or setup vcpkg (do not install any package)
         uses: lukka/[email protected]...
         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
src/openvpn/vcpkg.json +1 -2
index 40db1fd2..80645677 100644
@@ -8,6 +8,5 @@
     "lzo",
     "lz4",
     "pkcs11-helper"
-  ],
-  "builtin-baseline": "9259a0719d94c402aae2ab7975bc096afdec15df"
+  ]
 }
Signature · 1 line
2.23.0.windows.1
Acked-by on v1 1/1
#1 lore raw

As usual, I have no idea what this all does, but is not changing code, and seems to match the commit description (which sounds reasonable).

Your patch has been applied to the master branch.

commit f98aa0c76a45b8dea047fd60d687c2d377a2df06

Author: Lev Stipakov
Date:   Wed Nov 2 17:15:36 2022 +0200
     vcpkg: use the latest versions of dependency ports

     Signed-off-by: Lev Stipakov <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg25474.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering