From: "flichtenheld (Code Review)" Date: Tue, 8 Apr 2025 12:24:49 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <07657304d74386c8f4fcca56063da318035eb7e7-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="TE6/F4T0xHw="; 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: plaisthos Cc: openvpn-devel --TE6/F4T0xHw= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/934?usp=3Demail to review the following change. 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 --- M .github/workflows/build.yaml 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/34/934/1 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 -- 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: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-MessageType: newchange --TE6/F4T0xHw= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: plaisthos.

flichtenheld would like plaisthos to review this change.

Vi= ew Change

GHA: Use CMake 4.0 and apply required fixes

- update v= cpkg reference to 856505bb76
This includes a general work-around for t= he CMake 4.0
compat. See commit
a1aebfa9d5eae7cf493e0a706b43915d6= 87bb860.
- update lukka/get-cmake action to v4
- update dependency aw= s/aws-lc to v1.49.1

Change-Id: Ibabb4aa80d7786614dbd6b76bd4cd096f217= acfd
Signed-off-by: Frank Lichtenheld <frank@...2641...>
---M .github/workflows/build.yaml
1 file changed, 8 insertions(+), 8 delet= ions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/chan=
ges/34/934/1
diff --git a/.github/workflows/build.yaml b/.github/wo=
rkflows/build.yaml
index 2df495c..0f5e617 100644
= --- a/.github/workflows/build.yaml
+++ b/.github/work= flows/build.yaml
@@ -54,11 +54,11 @@
s= teps:
- 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
+ vcpkgGitCommitI= d: 856505bb767458c99d8e3c3ed441f59a058d3687
- name: = Install dependencies
run: ${VCPKG_ROOT}/vcpkg inst= all openssl lz4 cmocka
- name: configure OpenVPN wit= h 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@...2882...= .. # v4.0.0
- name: Restore from cache and install v= cpkg
uses: lukka/run-vcpkg@...2815... # v11.5
with:
- vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4
+ vcpkgGitCom= mitId: 856505bb767458c99d8e3c3ed441f59a058d3687
= vcpkgJsonGlob: '**/mingw/vcpkg.json'

- name: Run CMake with vcpkg.json manifest

@@ -2= 76,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 s= etup vcpkg (do not install any package)
uses: lukk= a/run-vcpkg@...2815... # v11.5
with:
- vcpkgGitCommitId: acd5bba= 5aac8b6573b5f6f463dc0341ac0ee6fa4
+ vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a0= 58d3687
vcpkgJsonGlob: '**/windows/vcpkg.jso= n'

- name: Run CMake with vcpk= g.json manifest (NO TESTS)
@@ -471,8 +471,8 @@
path: aws-lc
# versioning=3Dsemve= r-coerced
repository: aws/aws-lc
- ref: v1.42.0
- - uses: lukka/get-cmake@...2883...= 0... # v3.31.6
+ = ref: v1.49.1
+ = - uses: lukka/get-cmake@...2881... # v4.0.0
- na= me: "AWS-LC: build"
run: |
mkdir build

To view, visi= t change = 934. To unsubscribe, 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: 1
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-MessageType: newchange
--TE6/F4T0xHw=--