From: "cron2 (Code Review)" Date: Fri, 4 Apr 2025 11:08:30 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <7bf17f8affe92f4e8ffaab5806362cac733a4755-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="+ZmQHJpbcu0="; charset=UTF-8 Subject: [Openvpn-devel] [XS] Change in openvpn[release/2.6]: GHA: Pin version of CMake for MinGW build List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: plaisthos , openvpn-devel --+ZmQHJpbcu0= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/93= 0?usp=3Demail ) Change subject: GHA: Pin version of CMake for MinGW build ...................................................................... GHA: Pin version of CMake for MinGW build 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. Backport from master but much more limited since we do not have Android nor AWS LC builds in release/2.6. 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 Acked-by: Gert Doering (cherry picked from commit da65c4fdde20e36df38a90c1f1ef1d8ebf486c28) Message-Id: <20250402153250.4764-1-gert@...1296...> URL: https://www.mail-archive.com/search?l=3Dmid&q=3D20250402153250.4764-1-= gert@...1296... Signed-off-by: Gert Doering --- M .github/workflows/build.yaml 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5b1c797..37ac6ec 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -47,10 +47,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: -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/930?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: release/2.6 Gerrit-Change-Id: Ief11d5d7ccae084c863b50054d4e97c71f57d6f0 Gerrit-Change-Number: 930 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --+ZmQHJpbcu0= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

GHA: Pin version of CMake for MinGW build
<= br>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 al= so installs ninja)
and remove the installation via apt.

Backport = from master but much more limited since we
do not have Android nor AWS L= C builds in release/2.6.

Change-Id: Ief11d5d7ccae084c863b50054d4e97c= 71f57d6f0
Signed-off-by: Frank Lichtenheld <frank@...2641...>
A= cked-by: Gert Doering <gert@...1296...>
Message-Id: <2025040117= 0420.29808-1-gert@...1296...>
URL: https://www.mail-archive.com/openv= pn-devel@lists.sourceforge.net/msg31299.html
Signed-off-by: Gert Doering= <gert@...1296...>
Acked-by: Gert Doering <gert@...1296...><= br>(cherry picked from commit da65c4fdde20e36df38a90c1f1ef1d8ebf486c28)
= Message-Id: <20250402153250.4764-1-gert@...1296...>
URL: https://w= ww.mail-archive.com/search?l=3Dmid&q=3D20250402153250.4764-1-gert@...1711...= 96...
Signed-off-by: Gert Doering <gert@...1296...>
---
M .g= ithub/workflows/build.yaml
1 file changed, 2 insertions(+), 1 deletion(-= )

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

index 5b1c797..37ac6ec 100644
--- a/.githu= b/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -47,10 +47,11 @@
VCPKG_ROOT: ${{ g= ithub.workspace }}/vcpkg
steps:
= - name: Install dependencies
- run: sudo apt update && sudo apt install -y mingw-w= 64 unzip cmake ninja-build build-essential wget python3-docutils man2html-b= ase
+ run: sud= o apt update && sudo apt install -y mingw-w64 unzip build-essential= wget python3-docutils man2html-base
- name: Checkou= t 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:

To view, visit change 930. To unsubscribe, or for he= lp writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: Ief11d5d7ccae084c863b50054d4= e97c71f57d6f0
Gerrit-Change-Number: 930
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
--+ZmQHJpbcu0=--