From patchwork Tue Apr 1 17:04:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4201 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:6c6:b0:60a:d70a:d3c7 with SMTP id j6csp2993407maw; Tue, 1 Apr 2025 10:04:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVJiPY3e7JCEgYE7f1yoa/Z6NaEiaxWM9oeB1rVinZWcmHi4j7VHc2kKvazbGGqRvGzsNEa1Td12r0=@openvpn.net X-Google-Smtp-Source: AGHT+IH2odZ3gOYnzWGjIdS2dMkfyLuAUT+XFHAK2QCKVoya8aQH7UldYCw10YDVo5Alm0gCFmG8 X-Received: by 2002:a05:6830:304e:b0:727:4a6:5b31 with SMTP id 46e09a7af769-72c6382ca5fmr9589108a34.22.1743527095132; Tue, 01 Apr 2025 10:04:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743527095; cv=none; d=google.com; s=arc-20240605; b=HRcy5TuRXN+gRI4/vRcHZtiT7drg8Dr6252F6Tx9b8hxP+knKYWYiKQNeo1hTyfX66 b8oayAT+vadJOI4qPRY9uxMAl2FiA0eUUtZrPJ06GM4rjIXnWki+ni8hNMihLvo8IKMS DXlN7+REJ8qLxu+hhnDrsy/jZx6X8gTEbmHPTW/u9+zgHERVleut1O52HlrmDmskmivx YQ1q4oUa+fxrp2NQ2UyIWJ8y5hjwFPSKuhA8AlswpBv5Gb5yeOi0Lql0xr9jXDdaS7FM aNzaFMcZCmjdvCi423p7U0b3W5gqezf96guO8cxvAPCDfRdWoSvvJNHo4B1GHOhwHPyw xYMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature; bh=VqXORtyqXBWOqzDV3mJZg2zL9+7JPoZ0T2O2pLHaiVQ=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=XgKRYHZphk2uNzByNw3p+i2cO9txmXALVY1KL6KI0nHofiK3iNic4+/MYdQJFxrkbR 5T41bKa9YVyACsBghy4XnMbVPk0PRslhk2smGkNEUGSrWuP7WdPYiTAPYtgcE8ccBaGu 23+sG4d4AMzAZ1c4WsvRaFR8j+fMfsz7y8yqjx38b97qgrSC/NfFCzpSvxupCjAfM6x5 7bbGHdMIlCDQJ3HtqDgzSUF3R3eD+nPTwpdUPu7MrX0gAwxCmrya/pmwVIybePGaADbk lX9incOMz/kyf9T7+VZup4sexdygtZ0tFGGLO+lKdE/mCBEHe6zaPslDIKFGrX6jo048 QKyg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=eItRnX6T; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=ZxOU187Q; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 46e09a7af769-72c58166da7si8696738a34.138.2025.04.01.10.04.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Apr 2025 10:04:55 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=eItRnX6T; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=ZxOU187Q; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1tzf2i-0007Q3-9q; Tue, 01 Apr 2025 17:04:51 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1tzf2g-0007Pw-DP for openvpn-devel@lists.sourceforge.net; Tue, 01 Apr 2025 17:04:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=s5j0x8vjD6lJoFGhP1gJ1QfTlMrUNzI4lvOeHTHglVM=; b=eItRnX6T+fz4Usv2FGRuY6vZYn eOQkjykPJDjFP1Q2qAQ/UtA8j4RlNT46bkE5zibp70JDZfRE4OIURqiA+MnXMzIy4OKLs5gIphWKr QtPkhRLN/WOzuJ8PFwXb9HmMTo4bWBT7gYoN+sWgxFmTzuQvy/dgvnqmWQiG157Ya4Pg=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=s5j0x8vjD6lJoFGhP1gJ1QfTlMrUNzI4lvOeHTHglVM=; b=ZxOU187Q9mW7lI8LSNo7pql1P0 1Gf8Odjrl6ve2/8kpz+pm6tLaeo3uJIDlMQoS+CXrnXhxugCPFNB/z+uJ+7/WHPiKb/tutO3y/VAu jF7or1Rbq7zEgzhhtrxAQH0v6jV8D9oFrinOE9t7uYHhhxbr69F+RnrYhwQ4zvUTda+U=; Received: from dhcp-174.greenie.muc.de ([193.149.48.174] helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1tzf2P-0006Oi-49 for openvpn-devel@lists.sourceforge.net; Tue, 01 Apr 2025 17:04:49 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.17.1.9/8.17.1.9) with ESMTP id 531H4LRw029910 for ; Tue, 1 Apr 2025 19:04:21 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 531H4Lv5029864 for openvpn-devel@lists.sourceforge.net; Tue, 1 Apr 2025 19:04:21 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Tue, 1 Apr 2025 19:04:14 +0200 Message-ID: <20250401170420.29808-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Frank Lichtenheld 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. Content analysis details: (0.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [193.149.48.174 listed in bl.score.senderscore.com] 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [193.149.48.174 listed in sa-trusted.bondedsender.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1tzf2P-0006Oi-49 Subject: [Openvpn-devel] [PATCH v1] GHA: Pin version of CMake for all builds X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1828220667095851174?= X-GMAIL-MSGID: =?utf-8?q?1828220667095851174?= From: Frank Lichtenheld 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 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/929 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering 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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: lukka/get-cmake@56d043d188c3612951d8755da8f4b709ec951ad6 # v3.31.6 - name: Install vcpkg uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # 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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: lukka/get-cmake@56d043d188c3612951d8755da8f4b709ec951ad6 # v3.31.6 - name: Restore from cache and install vcpkg uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # 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 clang 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 liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev - name: "AWS-LC: checkout" uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: path: aws-lc repository: aws/aws-lc ref: v1.42.0 + - uses: lukka/get-cmake@56d043d188c3612951d8755da8f4b709ec951ad6 # v3.31.6 - name: "AWS-LC: build" run: | mkdir build