From: "flichtenheld (Code Review)" Date: Wed, 2 Apr 2025 10:31:23 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, gert@...1296... Message-ID: <79c91e2687016694478ba886d58d1213cf0698e8-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="6FlrHy0wYh4="; 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: plaisthos Cc: openvpn-devel --6FlrHy0wYh4= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: cron2, plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/930?usp=3Demail to review the following change. 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 (cherry picked from commit da65c4fdde20e36df38a90c1f1ef1d8ebf486c28) --- M .github/workflows/build.yaml 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/30/930/1 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: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: cron2 Gerrit-MessageType: newchange --6FlrHy0wYh4= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: cron2, plaisthos.

flichtenheld would like plaisthos to review this change.

Vi= ew Change

GHA: Pin version of CMake for MinGW build

Turns out th= at "apt install cmake" is useless since
Github installs also C= Make but not as a package. So
make sure we control which CMake we get an= d not
Github.

Switch to get-cmake action (which also installs nin= ja)
and remove the installation via apt.

Backport from master but= much more limited since we
do not have Android nor AWS LC builds in rel= ease/2.6.

Change-Id: Ief11d5d7ccae084c863b50054d4e97c71f57d6f0
Si= gned-off-by: Frank Lichtenheld <frank@...2641...>
Acked-by: Gert D= oering <gert@...1296...>
Message-Id: <20250401170420.29808-1-ge= rt@...1296...>
URL: https://www.mail-archive.com/openvpn-devel@...1199...= sourceforge.net/msg31299.html
Signed-off-by: Gert Doering <gert@...1711...= 96...>
(cherry picked from commit da65c4fdde20e36df38a90c1f1ef1d8ebf4= 86c28)
---
M .github/workflows/build.yaml
1 file changed, 2 insert= ions(+), 1 deletion(-)

git pull ssh://gerrit.openvpn.net:29418/op=
envpn refs/changes/30/930/1
diff --git a/.github/workflows/build.ya=
ml b/.github/workflows/build.yaml
index 5b1c797..37ac6ec 10= 0644
--- a/.github/workflows/build.yaml
+++= b/.github/workflows/build.yaml
@@ -47,10 +47,11 @@<= br> 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: a= ctions/checkout@...2844... # v4.2.2

+ - uses: lukka/get-cmake@...2870... = # v3.31.6
- name: Restore from cache and install vcp= kg
uses: lukka/run-vcpkg@...2815... # v11.5=
with:

To view, visit= change 9= 30. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: Ief11d5d7ccae084c863b50054d4= e97c71f57d6f0
Gerrit-Change-Number: 930
Gerrit-PatchSet: 1
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-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: cron2 <gert@...1296...>= ;
Gerrit-MessageType: newchange
--6FlrHy0wYh4=--