From: "cron2 (Code Review)" Date: Tue, 1 Apr 2025 18:00:59 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <5658e78c843bb3a77410067037af66ee41ed22ea-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="srkRsZUdVtA="; charset=UTF-8 Subject: [Openvpn-devel] [XS] Change in openvpn[master]: GHA: Pin version of CMake for all builds List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld , plaisthos Cc: openvpn-devel --srkRsZUdVtA= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has uploaded a new patch set (#2) to the change originally created by= flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/929?usp=3Demail ) The following approvals got outdated and were removed: Code-Review+2 by cron2 Change subject: GHA: Pin version of CMake for all builds ...................................................................... GHA: Pin version of CMake for all builds Turns out that "apt install cmake" is useless since Github installs also CMake but not as a package. So make sure we control which CMake we get and not Github. Switch to get-cmake action (which also installs ninja) and remove the installation via apt. Change-Id: Ief11d5d7ccae084c863b50054d4e97c71f57d6f0 Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Message-Id: <20250401170420.29808-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg31= 299.html Signed-off-by: Gert Doering --- M .github/workflows/build.yaml 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/29/929/2 diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b1af7ec..617b866 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -54,6 +54,7 @@ steps: - name: Checkout OpenVPN uses: actions/checkout@...2844... # v4.2.2 + - uses: lukka/get-cmake@...2870... # v3.31.6 - name: Install vcpkg uses: lukka/run-vcpkg@...2815... # v11.5 with: @@ -78,10 +79,11 @@ VCPKG_ROOT: ${{ github.workspace }}/vcpkg steps: - name: Install dependencies - run: sudo apt update && sudo apt install -y mingw-w64 unzip cmake = ninja-build build-essential wget python3-docutils man2html-base + run: sudo apt update && sudo apt install -y mingw-w64 unzip build-= essential wget python3-docutils man2html-base - name: Checkout OpenVPN uses: actions/checkout@...2844... # v4.2.2 + - uses: lukka/get-cmake@...2870... # v3.31.6 - name: Restore from cache and install vcpkg uses: lukka/run-vcpkg@...2815... # v11.5 with: @@ -457,13 +459,14 @@ steps: - name: Install dependencies - run: sudo apt update && sudo apt install -y cmake gcc ninja-build = golang make liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html cla= ng libcmocka-dev python3-docutils python3-jinja2 python3-jsonschema libtool= automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev + run: sudo apt update && sudo apt install -y gcc golang make liblzo= 2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev p= ython3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf= pkg-config libcap-ng-dev libnl-genl-3-dev - name: "AWS-LC: checkout" uses: actions/checkout@...2844... # v4.2.2 with: path: aws-lc repository: aws/aws-lc ref: v1.42.0 + - uses: lukka/get-cmake@...2870... # v3.31.6 - name: "AWS-LC: build" run: | mkdir build -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/929?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: Ief11d5d7ccae084c863b50054d4e97c71f57d6f0 Gerrit-Change-Number: 929 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: newpatchset --srkRsZUdVtA= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 uploaded patch set #2 to the change originally cr= eated by flichtenheld.

View Change

The following approvals got outda= ted and were removed: Code-Review+2 by cron2

GHA: Pin version of CMake for all builds

Turn= s out that "apt install cmake" is useless since
Github install= s also CMake but not as a package. So
make sure we control which CMake w= e get and not
Github.

Switch to get-cmake action (which also inst= alls ninja)
and remove the installation via apt.

Change-Id: Ief11= d5d7ccae084c863b50054d4e97c71f57d6f0
Signed-off-by: Frank Lichtenheld &l= t;frank@...2641...>
Acked-by: Gert Doering <gert@...1296...>Message-Id: <20250401170420.29808-1-gert@...1296...>
URL: https:/= /www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg31299.html
= Signed-off-by: Gert Doering <gert@...1296...>
---
M .github/wor= kflows/build.yaml
1 file changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/29/929/2
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.=
yaml
index b1af7ec..617b866 100644
--- a/.g= ithub/workflows/build.yaml
+++ b/.github/workflows/build.ya= ml
@@ -54,6 +54,7 @@
steps:
= - name: Checkout OpenVPN
uses: action= s/checkout@...2844... # v4.2.2
+ - uses: lukka/get-cmake@...2870... # v3.31.6
- name: Install vcpkg
uses: lukka/run-vc= pkg@...2815... # v11.5
with:
@@ -7= 8,10 +79,11 @@
VCPKG_ROOT: ${{ github.workspace }}/v= cpkg
steps:
- name: Install dep= endencies
- run:= sudo apt update && sudo apt install -y mingw-w64 unzip cmake ninja= -build build-essential wget python3-docutils man2html-base
+ run: sudo apt update &&a= mp; sudo apt install -y mingw-w64 unzip build-essential wget python3-docuti= ls man2html-base
- name: Checkout OpenVPN
= uses: actions/checkout@...2844... # v4.2.2
=
+ - uses: lukka= /get-cmake@...2870... # v3.31.6
- name: Restore from= cache and install vcpkg
uses: lukka/run-vcpkg@...493...= 2815... # v11.5
with:
@@ -457,13 += 459,14 @@

steps:
= - name: Install dependencies
- run: sudo apt update && sudo apt install -y cmak= e gcc ninja-build golang make liblzo2-dev libpam0g-dev liblz4-dev linux-lib= c-dev man2html clang libcmocka-dev python3-docutils python3-jinja2 python3-= jsonschema libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-= dev
+ run: sud= o apt update && sudo apt install -y gcc golang make liblzo2-dev lib= pam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-do= cutils python3-jinja2 python3-jsonschema libtool automake autoconf pkg-conf= ig libcap-ng-dev libnl-genl-3-dev
- name: "AWS-= LC: checkout"
uses: actions/checkout@...2875...= .. # v4.2.2
with:
path:= aws-lc
repository: aws/aws-lc
= ref: v1.42.0
c= hange 929. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ief11d5d7ccae084c863b50054d4= e97c71f57d6f0
Gerrit-Change-Number: 929
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: newpatchset
--srkRsZUdVtA=--