From: "cron2 (Code Review)" Date: Wed, 29 Apr 2026 13:18:58 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., yura.uddr@...277... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="trKCfWLKN2Y="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: GHA: Add caching for vcpkg builds List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: uddr , plaisthos , openvpn-devel --trKCfWLKN2Y= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/16= 42?usp=3Demail ) Change subject: GHA: Add caching for vcpkg builds ...................................................................... GHA: Add caching for vcpkg builds The nice automatic caching was removed last year, so go back to manual caching of the binary cache dir. While here, also update vcpkg to latest master. Change-Id: I933227aa4bc4f05b58d0e754b4330da807504d01 Signed-off-by: Frank Lichtenheld Acked-by: Yuriy Darnobyt Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1642 Message-Id: <20260429093938.23601-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg36= 775.html Signed-off-by: Gert Doering --- M .github/workflows/build.yaml M renovate.json 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 895f469..b530fcc 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -42,14 +42,23 @@ VCPKG_DEFAULT_TRIPLET: ${{ matrix.vcpkg_triplet }} VCPKG_ROOT: ${{ github.workspace }}/vcpkg VCPKG_INSTALLED_DIR: ${{ github.workspace }}/vcpkg/installed + VCPKG_BINARY_SOURCES: clear;default,readwrite + VCPKG_GIT_COMMIT_ID: 031f4afe03be385aee354f15be6e6b1fe57497c7 steps: - name: Checkout OpenVPN uses: actions/checkout@...2998... # v6.0.2 - uses: lukka/get-cmake@...3028... # v4.3.2 - - name: Install vcpkg + - name: Setup vcpkg uses: lukka/run-vcpkg@...3029... # v11.6 with: - vcpkgGitCommitId: e5a1490e1409d175932ef6014519e9ae149ddb7c + vcpkgGitCommitId: ${{ env.VCPKG_GIT_COMMIT_ID }} + - name: Set up vcpkg binary cache + uses: actions/cache@...3024... # v5.0.5 + with: + path: ${{ env.VCPKG_DEFAULT_BINARY_CACHE }} + key: android-${{ matrix.abi }}-vcpkg-binary-cache-${{ env.VCPKG_= GIT_COMMIT_ID }} + restore-keys: | + android-${{ matrix.abi }}-vcpkg-binary-cache- - name: Install dependencies run: ${VCPKG_ROOT}/vcpkg install openssl lz4 cmocka - name: configure OpenVPN with cmake @@ -70,10 +79,12 @@ arch: [x86, x64] build: [Release, Debug] - name: "gcc-mingw - ${{ matrix.arch }} - ${{matrix.build }} - OSSL" + name: "gcc-mingw - ${{ matrix.arch }} - ${{ matrix.build }} - OSSL" runs-on: ubuntu-24.04 env: VCPKG_ROOT: ${{ github.workspace }}/vcpkg + VCPKG_BINARY_SOURCES: clear;default,readwrite + VCPKG_GIT_COMMIT_ID: 031f4afe03be385aee354f15be6e6b1fe57497c7 steps: - name: Install dependencies run: sudo apt update && sudo apt install -y mingw-w64 unzip build-= essential wget python3-docutils man2html-base @@ -81,12 +92,21 @@ uses: actions/checkout@...2998... # v6.0.2 - uses: lukka/get-cmake@...3028... # v4.3.2 - - name: Restore from cache and install vcpkg + - name: Setup vcpkg uses: lukka/run-vcpkg@...3029... # v11.6 with: - vcpkgGitCommitId: e5a1490e1409d175932ef6014519e9ae149ddb7c + vcpkgGitCommitId: ${{ env.VCPKG_GIT_COMMIT_ID }} vcpkgJsonGlob: '**/mingw/vcpkg.json' + - name: Set up vcpkg binary cache + uses: actions/cache@...3024... # v5.0.5 + with: + path: ${{ env.VCPKG_DEFAULT_BINARY_CACHE }} + key: mingw-${{ matrix.arch }}-vcpkg-binary-cache-${{ hashFiles('= **/mingw/vcpkg.json') }}-${{ env.VCPKG_GIT_COMMIT_ID }} + restore-keys: | + mingw-${{ matrix.arch }}-vcpkg-binary-cache-${{ hashFiles('**/= mingw/vcpkg.json') }}- + mingw-${{ matrix.arch }}-vcpkg-binary-cache- + - name: Run CMake with vcpkg.json manifest uses: lukka/run-cmake@...3030... # v10.9 with: @@ -262,6 +282,8 @@ name: "msbuild - ${{ matrix.arch }} - openssl" env: BUILD_CONFIGURATION: Release + VCPKG_BINARY_SOURCES: clear;default,readwrite + VCPKG_GIT_COMMIT_ID: 031f4afe03be385aee354f15be6e6b1fe57497c7 runs-on: windows-2025 steps: @@ -271,12 +293,22 @@ - name: Install rst2html run: python -m pip install --upgrade pip docutils - - name: Restore artifacts, or setup vcpkg (do not install any packag= e) + - name: Setup vcpkg (do not install any package) uses: lukka/run-vcpkg@...3029... # v11.6 with: - vcpkgGitCommitId: e5a1490e1409d175932ef6014519e9ae149ddb7c + vcpkgGitCommitId: ${{ env.VCPKG_GIT_COMMIT_ID }} vcpkgJsonGlob: '**/windows/vcpkg.json' + - name: Set up vcpkg binary cache + uses: actions/cache@...3024... # v5.0.5 + with: + path: ${{ env.VCPKG_DEFAULT_BINARY_CACHE }} + key: msvc-${{ matrix.arch }}-vcpkg-binary-cache-${{ hashFiles('*= */windows/vcpkg.json') }}-${{ env.VCPKG_GIT_COMMIT_ID }} + restore-keys: | + msvc-${{ matrix.arch }}-vcpkg-binary-cache-${{ hashFiles('**/w= indows/vcpkg.json') }}- + msvc-${{ matrix.arch }}-vcpkg-binary-cache- + + - name: Run CMake with vcpkg.json manifest (NO TESTS) uses: lukka/run-cmake@...3030... # v10.9 if: ${{ matrix.arch =3D=3D 'arm64' }} diff --git a/renovate.json b/renovate.json index 809ac3f..3bd0917 100644 --- a/renovate.json +++ b/renovate.json @@ -27,7 +27,7 @@ "/^\\.github/workflows/.+\\.ya?ml$/" ], "matchStrings": [ - "vcpkgGitCommitId:\\s*(?.*?)\\n" + "VCPKG_GIT_COMMIT_ID:\\s*(?.*?)\\n" ], "currentValueTemplate": "master", "depNameTemplate": "vcpkg", -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1642?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings?usp=3Demail Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I933227aa4bc4f05b58d0e754b4330da807504d01 Gerrit-Change-Number: 1642 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-Reviewer: uddr Gerrit-CC: openvpn-devel --trKCfWLKN2Y= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 sub= mitted this change.

View Change

GHA: Add caching for vcpkg builds

The nic= e automatic caching was removed last year,
so go back to manual caching = of the binary cache
dir.

While here, also update vcpkg to latest = master.

Change-Id: I933227aa4bc4f05b58d0e754b4330da807504d01
Sign= ed-off-by: Frank Lichtenheld <frank@...2641...>
Acked-by: Yuriy Da= rnobyt <yura.uddr@...277...>
Gerrit URL: https://gerrit.openvpn.ne= t/c/openvpn/+/1642
Message-Id: <20260429093938.23601-1-gert@...2132...= .>
URL: https://www.mail-archive.com/openvpn-devel@...290...= net/msg36775.html
Signed-off-by: Gert Doering <gert@...1296...>---
M .github/workflows/build.yaml
M renovate.json
2 files change= d, 40 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml=

index 895f469..b530fcc 100644
--- a/.githu= b/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -42,14 +42,23 @@
VCPKG_DEFAULT_TRI= PLET: ${{ matrix.vcpkg_triplet }}
VCPKG_ROOT: ${{ gi= thub.workspace }}/vcpkg
VCPKG_INSTALLED_DIR: ${{ git= hub.workspace }}/vcpkg/installed
+ VCPKG_BINARY_SOURCES: clear;default,readwrite
= + VCPKG_GIT_COMMIT_ID: 031= f4afe03be385aee354f15be6e6b1fe57497c7
steps: - name: Checkout OpenVPN
uses: actio= ns/checkout@...2998... # v6.0.2
- uses: lukka/get-cm= ake@...3028... # v4.3.2
- - name: Install vcpkg
+ - name: Setup vcpkg
uses: lukka/ru= n-vcpkg@...3029... # v11.6
with:
- vcpkgGitCommitId: e5a1490e140= 9d175932ef6014519e9ae149ddb7c
+ vcpkgGitCommitId: ${{ env.VCPKG_GIT_COMMIT_ID }}=
+ - name: Set up vcpkg= binary cache
+ = uses: actions/cache@...3024... # v5.0.5
+ with:
+ path: ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
+ key: android-${= { matrix.abi }}-vcpkg-binary-cache-${{ env.VCPKG_GIT_COMMIT_ID }}+ restore-keys: |

+ android-${{= matrix.abi }}-vcpkg-binary-cache-
- name: Install d= ependencies
run: ${VCPKG_ROOT}/vcpkg install opens= sl lz4 cmocka
- name: configure OpenVPN with cmake
@@ -70,10 +79,12 @@
arch: [x86, x64= ]
build: [Release, Debug]
=
- name: "gcc-mingw - = ${{ matrix.arch }} - ${{matrix.build }} - OSSL"
+ name: "gcc-mingw - ${{ matrix.ar= ch }} - ${{ matrix.build }} - OSSL"
runs-on: ubun= tu-24.04
env:
VCPKG_ROOT: ${{ g= ithub.workspace }}/vcpkg
+ VCPKG_BINARY_SOURCES: clear;default,readwrite
+ VCPKG_GIT_COMMIT_ID: 031f4afe03b= e385aee354f15be6e6b1fe57497c7
steps:
= - name: Install dependencies
run: sudo apt u= pdate && sudo apt install -y mingw-w64 unzip build-essential wget p= ython3-docutils man2html-base
@@ -81,12 +92,21 @@ uses: actions/checkout@...2998... # v6.0.2
=
- uses: lukka/get-cmake@...3028... # v4.3.2=
- - name: Restore from c= ache and install vcpkg
- vcpkgGitCommitId: e5a1490e1409d17593= 2ef6014519e9ae149ddb7c
+ - name: Set = up vcpkg binary cache
+ uses: actions/cache@...3024... # v5.0.5
+ with:
+ path: ${{ env.VCPKG_DEFAULT_BINARY_CACHE = }}
+ key: mi= ngw-${{ matrix.arch }}-vcpkg-binary-cache-${{ hashFiles('**/mingw/vcpkg= .json') }}-${{ env.VCPKG_GIT_COMMIT_ID }}
+ restore-keys: |
+ mingw-${{ matrix.arch }}-vcpk= g-binary-cache-${{ hashFiles('**/mingw/vcpkg.json') }}-
<= span style=3D"color: hsl(120, 100%, 40%);">+ mingw-${{ matrix.ar= ch }}-vcpkg-binary-cache-

+
- name: Run CMake with vcpkg.json manifest
uses: lukka/run-cmake@...3030... # v10.9
<= span> with:

@@ -262,6 +282,8 @@
= name: "msbuild - ${{ matrix.arch }} - openssl"
env:
BUILD_CONFIGURATION: Release<= br>+ VCPKG_BINARY_SOURCE= S: clear;default,readwrite
+ VCPKG_GIT_COMMIT_ID: 031f4afe03be385aee354f15be6e6b1fe57497c= 7

runs-on: windows-2025
= steps:
@@ -271,12 +293,22 @@
= - name: Install rst2html
run: python -m pip = install --upgrade pip docutils

- - name: Restore artifacts, or setup vcpkg = (do not install any package)
+ - name: Setup vcpkg (do not install any package)
<= span> uses: lukka/run-vcpkg@...3029... # v11.6
= with:
- v= cpkgGitCommitId: e5a1490e1409d175932ef6014519e9ae149ddb7c
+ vcpkgGitCommitId: ${{ env.V= CPKG_GIT_COMMIT_ID }}
vcpkgJsonGlob: '**/win= dows/vcpkg.json'

+ - name: Set up vcpkg binary cache
+ uses: actions/cache@...3036...= .. # v5.0.5
+ = with:
+ path= : ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}
+ key: msvc-${{ matrix.arch }}-vcpkg-binary-cac= he-${{ hashFiles('**/windows/vcpkg.json') }}-${{ env.VCPKG_GIT_COMM= IT_ID }}
+ r= estore-keys: |
+ = msvc-${{ matrix.arch }}-vcpkg-binary-cache-${{ hashFiles('**/win= dows/vcpkg.json') }}-
+ msvc-${{ matrix.arch }}-vcpkg-binary-cache-
+
+
- name: Run CMake with vcpkg= .json manifest (NO TESTS)
uses: lukka/run-cmake@...1186...= .3030... # v10.9
if: ${{ matrix.arch =3D=3D 'a= rm64' }}
diff --git a/renovate.json b/renovate.json

index 809ac3f..3bd0917 100644
--- a/renovate.j= son
+++ b/renovate.json
@@ -27,7 +27,7 @@
"/^\\.github/workflows/.+\\.ya?ml$/&qu= ot;
],
"matc= hStrings": [
- = "vcpkgGitCommitId:\\s*(?<currentDigest>.*?)\\n"=
+ &qu= ot;VCPKG_GIT_COMMIT_ID:\\s*(?<currentDigest>.*?)\\n"
<= span> ],

"currentValueTemplat= e": "master",
"depNameTemp= late": "vcpkg",

To view,= visit c= hange 1642. To unsubscribe, or for help writing mail filters, visit settings.

<= meta itemprop=3D"name" content=3D"View Change"/>
Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I933227aa4bc4f05b58d0e754b43= 30da807504d01
Gerrit-Change-Number: 1642
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-Reviewer: uddr <yura.uddr@...277...&= gt;
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
= --trKCfWLKN2Y=--