From: "cron2 (Code Review)" Date: Wed, 9 Apr 2025 20:01:21 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., yura.uddr@...277... Message-ID: <2de302ae5fe061f83ddbd13e1b5539d8fd320bdd-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="pF1oltfbuio="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: GHA: Use CMake 4.0 and apply required fixes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: uddr , plaisthos , openvpn-devel --pF1oltfbuio= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/93= 4?usp=3Demail ) Change subject: GHA: Use CMake 4.0 and apply required fixes ...................................................................... GHA: Use CMake 4.0 and apply required fixes - update vcpkg reference to 856505bb76 This includes a general work-around for the CMake 4.0 compat. See commit a1aebfa9d5eae7cf493e0a706b43915d687bb860. - update lukka/get-cmake action to v4 - update dependency aws/aws-lc to v1.49.1 Change-Id: Ibabb4aa80d7786614dbd6b76bd4cd096f217acfd Signed-off-by: Frank Lichtenheld Acked-by: Yuriy Darnobyt Message-Id: <20250409131148.18147-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg31= 399.html Signed-off-by: Gert Doering --- M .github/workflows/build.yaml 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2df495c..0f5e617 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -54,11 +54,11 @@ steps: - name: Checkout OpenVPN uses: actions/checkout@...2844... # v4.2.2 - - uses: lukka/get-cmake@...2870... # v3.31.6 + - uses: lukka/get-cmake@...2881... # v4.0.0 - name: Install vcpkg uses: lukka/run-vcpkg@...2815... # v11.5 with: - vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4 + vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a058d3687 - name: Install dependencies run: ${VCPKG_ROOT}/vcpkg install openssl lz4 cmocka - name: configure OpenVPN with cmake @@ -88,11 +88,11 @@ - name: Checkout OpenVPN uses: actions/checkout@...2844... # v4.2.2 - - uses: lukka/get-cmake@...2870... # v3.31.6 + - uses: lukka/get-cmake@...2881... # v4.0.0 - name: Restore from cache and install vcpkg uses: lukka/run-vcpkg@...2815... # v11.5 with: - vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4 + vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a058d3687 vcpkgJsonGlob: '**/mingw/vcpkg.json' - name: Run CMake with vcpkg.json manifest @@ -276,7 +276,7 @@ runs-on: windows-latest steps: - uses: actions/checkout@...2844... # v4.2.2 - - uses: lukka/get-cmake@...2870... # v3.31.6 + - uses: lukka/get-cmake@...2881... # v4.0.0 - name: Install rst2html run: python -m pip install --upgrade pip docutils @@ -284,7 +284,7 @@ - name: Restore artifacts, or setup vcpkg (do not install any packag= e) uses: lukka/run-vcpkg@...2815... # v11.5 with: - vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4 + vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a058d3687 vcpkgJsonGlob: '**/windows/vcpkg.json' - name: Run CMake with vcpkg.json manifest (NO TESTS) @@ -471,8 +471,8 @@ path: aws-lc # versioning=3Dsemver-coerced repository: aws/aws-lc - ref: v1.42.0 - - uses: lukka/get-cmake@...2870... # v3.31.6 + ref: v1.49.1 + - uses: lukka/get-cmake@...2881... # v4.0.0 - name: "AWS-LC: build" run: | mkdir build --=20 To view, visit http://gerrit.openvpn.net/c/openvpn/+/934?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Ibabb4aa80d7786614dbd6b76bd4cd096f217acfd Gerrit-Change-Number: 934 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-Reviewer: uddr Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --pF1oltfbuio= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

GHA: Use CMake 4.0 and apply required fixes
- update vcpkg reference to 856505bb76
This includes a general wo= rk-around for the CMake 4.0
compat. See commit
a1aebfa9d5eae7cf49= 3e0a706b43915d687bb860.
- update lukka/get-cmake action to v4
- updat= e dependency aws/aws-lc to v1.49.1

Change-Id: Ibabb4aa80d7786614dbd6= b76bd4cd096f217acfd
Signed-off-by: Frank Lichtenheld <frank@...2723...= .>
Acked-by: Yuriy Darnobyt <yura.uddr@...277...>
Message-Id= : <20250409131148.18147-1-gert@...1296...>
URL: https://www.mail-a= rchive.com/openvpn-devel@lists.sourceforge.net/msg31399.html
Signed-off-= by: Gert Doering <gert@...1296...>
---
M .github/workflows/buil= d.yaml
1 file changed, 8 insertions(+), 8 deletions(-)

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

index 2df495c..0f5e617 100644
--- a/.githu= b/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -54,11 +54,11 @@
steps:
- name: Checkout OpenVPN

uses: actions/= checkout@...2844... # v4.2.2
- - uses: lukka/get-cmake@...2870... # v3.31.6
+ - uses: lukka/get-cmake@...2884...= ... # v4.0.0
- name: Install vcpkg
= uses: lukka/run-vcpkg@...2815... # v11.5
w= ith:
- vcpkgGi= tCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
+ vcpkgGitCommitId: 856505bb76745= 8c99d8e3c3ed441f59a058d3687
- name: Install dependen= cies
run: ${VCPKG_ROOT}/vcpkg install openssl lz4 = cmocka
- name: configure OpenVPN with cmake@@ -88,11 +88,11 @@
- name: Checkout OpenVPN=
uses: actions/checkout@...2844... # v4.2.2=

- - us= es: lukka/get-cmake@...2870... # v3.31.6
+ - uses: lukka/get-cmake@...2881... # v4.0.0
- name: Restore from cache and install vcpkg
<= span> uses: lukka/run-vcpkg@...2815... # v11.5

= with:
- v= cpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
+ vcpkgGitCommitId: 856505bb7= 67458c99d8e3c3ed441f59a058d3687
vcpkgJsonGlob: &= #39;**/mingw/vcpkg.json'

- nam= e: Run CMake with vcpkg.json manifest
@@ -276,7 +276,7 @@
runs-on: windows-latest
steps:=
- uses: actions/checkout@...2844... # v4.2.2=
- - uses: lukka/get-cmak= e@...2870... # v3.31.6
- vcpkgGitCommitId: acd5bba5aac8b6573b5f6f4= 63dc0341ac0ee6fa4
+ = vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a058d3687 vcpkgJsonGlob: '**/windows/vcpkg.json'
- name: Run CMake with vcpkg.json manifest = (NO TESTS)
@@ -471,8 +471,8 @@
p= ath: aws-lc
# versioning=3Dsemver-coerced=
repository: aws/aws-lc
- ref: v1.42.0
- - uses: lukka/get-cmake@...2870... # v3.31.6
+ ref: v1.49.= 1
+ - uses: lukk= a/get-cmake@...2881... # v4.0.0
- name: "AWS-LC= : build"
run: |
mk= dir build

To view, visit change 934. To unsu= bscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ibabb4aa80d7786614dbd6b76bd4= cd096f217acfd
Gerrit-Change-Number: 934
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>
Gerrit-MessageType: merged
--pF1oltfbuio=--