From patchwork Wed Apr 2 15:32:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4210 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:6c6:b0:60a:d70a:d3c7 with SMTP id j6csp3572528maw; Wed, 2 Apr 2025 08:33:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUj8XMxt3wV5tYtE/sx28oeT/uemAieC1WJYn3MPMZCdHRd5rdcANxJveok4JU6udFnnjA8PNn4uuA=@openvpn.net X-Google-Smtp-Source: AGHT+IHwUEdVHGm70LJ/n13D5CQuP1+geMs2OgWqyb/4Xzr6ObDb39hdIDKEjrf28BIGGGH+zDdL X-Received: by 2002:a05:6602:480f:b0:85b:3a51:2923 with SMTP id ca18e2360f4ac-85e9e9303abmr1998980439f.14.1743608001051; Wed, 02 Apr 2025 08:33:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743608001; cv=none; d=google.com; s=arc-20240605; b=ZzmAsN51b7xoP8YRKEDxsREt8/Z/smYyyrdkJagBw+8D1m3RQf6/XwHoEuEJsVR694 TFCEHMpEyhnRrmak3aFHI5gGAGjElv2/CKifNobDd742KUuK7eOdAUHfUlUw1z9b36Vk h1RJduRhb+hpoCu4Xq/TvZtS7nag72pOHn6ngVpZvHt4LjOxfNT/WfuufajUbwr2MM9v 2+9quv2qrYJ00zaIy08ZzUNVBP8fQ47q0ks2xPiwWgqXynKPLSzROYl6/YWVoJD+7hyX p+uRpCHqNk22wd0OlYuHNrJZ5DECX2jLgoDlEKF8ZYHWOZNZ/tBnCis693oPCzCXTggO GRbg== 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=BndCPIgwm3yffQG840pMPhXOsYCGLNXaeXa9QufhI1o=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=NMAqafK/nEoMIxg2gy/Cxf4kWs+xthLDnmqBfqissxZ/SbMd3xUsUbX2hQnx/878ng BSemc4bkMZX2OUregiJGgjYmPIZdatuFMV4mV8d9ELAOuWvNTYglkRgUn6CHa6T2GgGn ymcQGHEqBPkHcJCA3NcroH/4aDbuA8U4JNa16GwunLsEKGIE6w3tWJ9tOxYQdxYbXamt yrT9katlT3ogymM3PI9VY2vOOW6KH0CvCEtliIQRArz85hxBQ1Br0mH9hXskk3I56ZuD HmdyKsSQ8OPw5qv1oDY/tXu9736DhI9Dty2et+BdP9fllMLd8MvtN6nV+LnxCTnPJMLt 8EQw==; 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=ONryYam4; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=mg2Rg2w2; 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 8926c6da1cb9f-4f46486d494si11903416173.86.2025.04.02.08.33.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Apr 2025 08:33:21 -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=ONryYam4; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=mg2Rg2w2; 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-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1u005f-0007uC-3A; Wed, 02 Apr 2025 15:33:19 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1u005e-0007u6-4d for openvpn-devel@lists.sourceforge.net; Wed, 02 Apr 2025 15:33:18 +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=d/ABXlOJ1oYvfWq6BCfeHEQjcge/gaMplIgGaC1tTvE=; b=ONryYam496WnYRxvWdgRONfJKY xeSWJIKOAIalRj9KQDcs2w3HmWbEGwxq6hXwZVYXwLfNdf1uywFcd5KGTy2CdaS1d525q5KmTVZSU Lun8YR+JsU8BZ0t+s09pMaEG9RiHIuHlvK13xs5HYVOQaZmHqXDa+RKqPddZo0X99qXQ=; 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=d/ABXlOJ1oYvfWq6BCfeHEQjcge/gaMplIgGaC1tTvE=; b=mg2Rg2w2idjTBN8kLuEzwgApSY tS096fNWmhsFEk+0/bcrwVjcirTYSKYQmgy0H/ykwjGRmaQbFp22LtwB2EcReubHnKRQ4zr0/+tyq Ixm5hxBDpGiBBYUbYo80OV7soUP98Dulp9RrNxlLazq2PFiwSkb6pn2ACzY1dzz8TaMc=; 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 1u005O-0006ZX-8G for openvpn-devel@lists.sourceforge.net; Wed, 02 Apr 2025 15:33:18 +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 532FWoW2004844 for ; Wed, 2 Apr 2025 17:32:50 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 532FWoLv004843 for openvpn-devel@lists.sourceforge.net; Wed, 2 Apr 2025 17:32:50 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Wed, 2 Apr 2025 17:32:44 +0200 Message-ID: <20250402153250.4764-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-2.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_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Headers-End: 1u005O-0006ZX-8G Subject: [Openvpn-devel] [PATCH v1] GHA: Pin version of CMake for MinGW build 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?1828305503469679572?= X-GMAIL-MSGID: =?utf-8?q?1828305503469679572?= 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. 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@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg31299.html Signed-off-by: Gert Doering Acked-by: Gert Doering (cherry picked from commit da65c4fdde20e36df38a90c1f1ef1d8ebf486c28) --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to release/2.6. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/930 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 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@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: