From: "cron2 (Code Review)" Date: Tue, 1 Apr 2025 18:01:01 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <5658e78c843bb3a77410067037af66ee41ed22ea-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="0gF3cutOztQ="; 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 Cc: plaisthos , openvpn-devel --0gF3cutOztQ= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/92= 9?usp=3Demail ) 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(-) 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: merged --0gF3cutOztQ= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

GHA: Pin version of CMake for all builds
Turns out that "apt install cmake" is useless since
Github i= nstalls also CMake but not as a package. So
make sure we control which C= Make we get and not
Github.

Switch to get-cmake action (which als= o installs ninja)
and remove the installation via apt.

Change-Id:= Ief11d5d7ccae084c863b50054d4e97c71f57d6f0
Signed-off-by: Frank Lichtenh= eld <frank@...2641...>
Acked-by: Gert Doering <gert@...1296...&= gt;
Message-Id: <20250401170420.29808-1-gert@...1296...>
URL: h= ttps://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg31299.ht= ml
Signed-off-by: Gert Doering <gert@...1296...>
---
M .gith= ub/workflows/build.yaml
1 file changed, 5 insertions(+), 2 deletions(-)<= br>
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml=

index b1af7ec..617b866 100644
--- a/.githu= b/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -54,6 +54,7 @@
steps:
- name: Checkout OpenVPN

uses: actions/ch= eckout@...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 depende= ncies
- run: sud= o apt update && sudo apt install -y mingw-w64 unzip cmake ninja-bui= ld build-essential wget python3-docutils man2html-base
+ run: sudo apt update && = sudo apt install -y mingw-w64 unzip build-essential wget python3-docutils m= an2html-base
- name: Checkout OpenVPN
uses: actions/checkout@...2844... # v4.2.2

+ - uses: lukka/get= -cmake@...2870... # v3.31.6
- name: Restore from cac= he and install vcpkg
uses: lukka/run-vcpkg@...2876...= ... # v11.5
with:
@@ -457,13 +459,= 14 @@

steps:
= - name: Install dependencies
- run: sudo apt update && sudo apt install -y cmake gc= c ninja-build golang make liblzo2-dev libpam0g-dev liblz4-dev linux-libc-de= v man2html clang libcmocka-dev python3-docutils python3-jinja2 python3-json= schema libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev<= /span>
+ run: sudo ap= t update && sudo apt install -y gcc golang make liblzo2-dev libpam0= g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docuti= ls python3-jinja2 python3-jsonschema libtool automake autoconf pkg-config l= ibcap-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: |
<= span> mkdir build


To view, vi= sit chang= e 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: merged
--0gF3cutOztQ=--