[Openvpn-devel] GitHub Actions: use latest working lukka/run-vcpkg

Message ID 20211015203847.465-1-lstipakov@gmail.com
State Accepted
Headers show
Series [Openvpn-devel] GitHub Actions: use latest working lukka/run-vcpkg | expand

Commit Message

Lev Stipakov Oct. 15, 2021, 9:38 a.m. UTC
From: Lev Stipakov <lev@openvpn.net>

Latest lukka/run-vcpkg@v10 seem to break non-manifest
mode with custom triplets, so revert to latest working version.

While on it, bump vcpkg commit.

Signed-off-by: Lev Stipakov <lev@openvpn.net>
---
 .github/workflows/build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Gert Doering Oct. 19, 2021, 2:54 a.m. UTC | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

This is 2.5 only - tested via GH in my repo, before pushing to the
official repo.  I have no idea what it does, but it does not affect
code... and it fixes the GH build errors we had before (so I can
proceed with merging and test building Selva's win/EC patches).

Your patch has been applied to the release/2.5 branch.

commit db1a72cc8bc7e0a4d6c70e103febb97fe69949b2
Author: Lev Stipakov
Date:   Fri Oct 15 23:38:47 2021 +0300

     GitHub Actions: use latest working lukka/run-vcpkg

     Signed-off-by: Lev Stipakov <lev@openvpn.net>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20211015203847.465-1-lstipakov@gmail.com>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg22959.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 99885ad3..ca58a279 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -215,11 +215,11 @@  jobs:
         run: python -m pip install --upgrade pip rst2html
 
       - name: Restore artifacts, or run vcpkg, build and cache artifacts
-        uses: lukka/run-vcpkg@main
+        uses: lukka/run-vcpkg@v7.4
         with:
+          vcpkgGitCommitId: '71422c627264daedcbcd46f01f1ed0dcd8460f1b'
           vcpkgArguments: 'openssl lz4 lzo pkcs11-helper tap-windows6'
           vcpkgTriplet: '${{ matrix.triplet }}-windows-ovpn'
-          vcpkgGitCommitId: '7d472dd25830da92108eb76642c667aaa40512cb'
           cleanAfterBuild: false
 
       - name: Build