From: "flichtenheld (Code Review)" Date: Tue, 1 Apr 2025 16:38:23 +0000 References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <50683004da0c4da9868b906542e15ee786031758-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="MYET9MSximA="; 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: plaisthos Cc: openvpn-devel --MYET9MSximA= 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/+/929?usp=3Demail to review the following change. 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 --- M .github/workflows/build.yaml 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/29/929/1 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: 1 Gerrit-Owner: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-MessageType: newchange --MYET9MSximA= 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: Pin version of CMake for all builds

Turns out tha= t "apt install cmake" is useless since
Github installs also CM= ake 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 ninj= a)
and remove the installation via apt.

Change-Id: Ief11d5d7ccae0= 84c863b50054d4e97c71f57d6f0
Signed-off-by: Frank Lichtenheld <frank@...220...= ..2641...>
---
M .github/workflows/build.yaml
1 file changed, 5= insertions(+), 2 deletions(-)

git pull ssh://gerrit.openvpn.net:=
29418/openvpn refs/changes/29/929/1
diff --git a/.github/workflows/=
build.yaml b/.github/workflows/build.yaml
index b1af7ec..61= 7b866 100644
--- a/.github/workflows/build.yaml
<= span>+++ b/.github/workflows/build.yaml
@@ -54,6 +54,7 @@
steps:
- name: Checkout OpenVPN<= /span>
uses: actions/checkout@...2844... # v4.2.2<= br>+ - uses: lukka/get-cma= ke@...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 i= nstall -y mingw-w64 unzip cmake ninja-build build-essential wget python3-do= cutils man2html-base
= + run: sudo apt update && sudo apt install -y mingw-w64 unzi= p 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 updat= e && sudo apt install -y cmake gcc ninja-build golang make liblzo2-= dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev pyt= hon3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf p= kg-config libcap-ng-dev libnl-genl-3-dev
+ run: sudo apt update && sudo apt insta= ll -y gcc golang make liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev ma= n2html clang libcmocka-dev python3-docutils python3-jinja2 python3-jsonsche= ma libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev
- name: "AWS-LC: checkout"
= uses: actions/checkout@...2844... # v4.2.2
w= ith:
path: aws-lc
rep= ository: aws/aws-lc
ref: v1.42.0
+ - uses: lukka/get-cmake@...2825...= 70... # v3.31.6

- name: "AWS-LC: build"
run: |
mkdir build=

To view, visit change 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: 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
--MYET9MSximA=--