From patchwork Wed Apr 9 13:11:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4216 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:8598:b0:63e:cbae:3930 with SMTP id az24csp790061mab; Wed, 9 Apr 2025 06:12:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVBzmGJR2/VAmNbVB/7+inVq8fJ6Vwk5R6SHAdWMfULn8bb9LbT6g9XllEDvzq0yq5HvW4A15dZPn0=@openvpn.net X-Google-Smtp-Source: AGHT+IGcYgLjToGS4ou8XwQVO/PuwvMMSJUZ5E8DAukr2zafygvAbiIUCMOsvkBGFWRMClOEiiHd X-Received: by 2002:a05:6871:4e89:b0:29e:4340:b1b with SMTP id 586e51a60fabf-2d08dd54881mr1497997fac.9.1744204345315; Wed, 09 Apr 2025 06:12:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744204345; cv=none; d=google.com; s=arc-20240605; b=PI1iQnQ17G5i+oYw/1g/ABdYXm/UGCVWToHySf6h2+CpXS3CLt8cjyWfs8ffuvVQHl qb7cwIyEuwTKSGYhyt0E5cV2uDOOjAroCBagy4KYywOGPMc+Liso4Mwfb8K5wREmG24O 31IYJCp1MfkJtjXi4M+YPMjdvjQ5NaBYoR8gykB9HawkZcptx/P97BUitDB06I2oqock BaM3j0b7Epn8e7eByEi7p8pdwFa9AesEtolYUJR6sLtb59bvJ5AzroXk2Vh4IzRqUyMx GUt8kWLatLDN5ZCp+K4utDHwRISZn6RlLx1cyTzv9wF+qRFO+exEddECMW5F7YzruW50 7UYA== 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=iYq73CM3rOa6y/+3p0hhIT/zBmQ8R/8aQHnbxxA8nSM=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=IoBsBG6MEa6rvX7rtihHPR1TR+w/4Ah/gtaje8YqJY852Dyr/jUaA10OioGoEXJdxO PjwUs5TlYu/dYyUYeIU0XX5vcXN7miQPSiPVLcA09FQPV+dGVTrVmofsnMnVC2CcbFHc 6bLwd8XfmMlnC108MpK/AwxJIDFV5pKPV+c77+05zCA0xpDI9cNJB0gwJum13m8anjiQ c2vkZ7PPEQQGfR5MNhoB2WBAONLNKvL5A72+fHzrfd6qkT2E9S6Tz8tJNaO0tTDcicKU UkJekvig6ALYQ0v1MUTwhHTSHTdrqZa8qwnL657c12pyxPkJDzUb+BWOVytbb3MdptMk g46A==; 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=QK4xqZCT; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Psl6rg88; 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-72e73e59d6esi526002a34.162.2025.04.09.06.12.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Apr 2025 06:12:25 -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=QK4xqZCT; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=Psl6rg88; 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-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1u2VE3-0004Rf-6M; Wed, 09 Apr 2025 13:12:19 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1u2VE0-0004RX-A5 for openvpn-devel@lists.sourceforge.net; Wed, 09 Apr 2025 13:12:16 +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=8raX4fVw3fhd83OXPd0aofrg4tTPjkn1eYGMoRxsAXU=; b=QK4xqZCTJmGDHPonNhqK7+zFEo ce526VTDlqr8HdF2Vx7/DxB6RtxpjlaUZPFY5expfyyNunH3mk3PR7qU/gqczMqs1wm+ykyeQl7jw +fY4toBQlBX5hx0Fw+gPqQQxWfaqn6tj7JN75zKL9AWY9Ejph4asfEUlAeWIl9lI+IVg=; 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=8raX4fVw3fhd83OXPd0aofrg4tTPjkn1eYGMoRxsAXU=; b=Psl6rg88CmI0QuG9QiMSIDvV1d 5HxGBlJqrmIG60Q9vBTNMrfmw2u2/GFVZ+RzoTp1P15H9uib1A1EhJed4qXzp/wYEzg99aRpi+4ui fjogeSwkETMcULTPuLisoryymRKDnDmjZld0a2MttfZcMnOvbvMB9cIhySQFs07c4I34=; 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 1u2VDk-0001AL-Bu for openvpn-devel@lists.sourceforge.net; Wed, 09 Apr 2025 13:12:16 +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 539DBmYA018264 for ; Wed, 9 Apr 2025 15:11:48 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 539DBmno018263 for openvpn-devel@lists.sourceforge.net; Wed, 9 Apr 2025 15:11:48 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Wed, 9 Apr 2025 15:11:42 +0200 Message-ID: <20250409131148.18147-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 - update vcpkg reference to 856505bb76 This includes a general work-around for the CMake 4.0 compat. See commit a1aebfa9d5eae7cf493e0a706b43915d687bb860. - update lukka/get-cmake action to v4 - update [...] Content analysis details: (0.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 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 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 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: openvpn.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1u2VDk-0001AL-Bu Subject: [Openvpn-devel] [PATCH v1] GHA: Use CMake 4.0 and apply required fixes 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?1828930815317212606?= X-GMAIL-MSGID: =?utf-8?q?1828930815317212606?= From: Frank Lichtenheld - update vcpkg reference to 856505bb76 This includes a general work-around for the CMake 4.0 compat. See commit a1aebfa9d5eae7cf493e0a706b43915d687bb860. - update lukka/get-cmake action to v4 - update dependency aws/aws-lc to v1.49.1 Change-Id: Ibabb4aa80d7786614dbd6b76bd4cd096f217acfd Signed-off-by: Frank Lichtenheld Acked-by: Yuriy Darnobyt --- 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/+/934 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Yuriy Darnobyt diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2df495c..0f5e617 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -54,11 +54,11 @@ steps: - name: Checkout OpenVPN uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: lukka/get-cmake@56d043d188c3612951d8755da8f4b709ec951ad6 # v3.31.6 + - uses: lukka/get-cmake@28983e0d3955dba2bb0a6810caae0c6cf268ec0c # v4.0.0 - name: Install vcpkg uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5 with: - vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4 + vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a058d3687 - name: Install dependencies run: ${VCPKG_ROOT}/vcpkg install openssl lz4 cmocka - name: configure OpenVPN with cmake @@ -88,11 +88,11 @@ - name: Checkout OpenVPN uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: lukka/get-cmake@56d043d188c3612951d8755da8f4b709ec951ad6 # v3.31.6 + - uses: lukka/get-cmake@28983e0d3955dba2bb0a6810caae0c6cf268ec0c # v4.0.0 - name: Restore from cache and install vcpkg uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5 with: - vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4 + vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a058d3687 vcpkgJsonGlob: '**/mingw/vcpkg.json' - name: Run CMake with vcpkg.json manifest @@ -276,7 +276,7 @@ runs-on: windows-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: lukka/get-cmake@56d043d188c3612951d8755da8f4b709ec951ad6 # v3.31.6 + - uses: lukka/get-cmake@28983e0d3955dba2bb0a6810caae0c6cf268ec0c # v4.0.0 - name: Install rst2html run: python -m pip install --upgrade pip docutils @@ -284,7 +284,7 @@ - name: Restore artifacts, or setup vcpkg (do not install any package) uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5 with: - vcpkgGitCommitId: acd5bba5aac8b6573b5f6f463dc0341ac0ee6fa4 + vcpkgGitCommitId: 856505bb767458c99d8e3c3ed441f59a058d3687 vcpkgJsonGlob: '**/windows/vcpkg.json' - name: Run CMake with vcpkg.json manifest (NO TESTS) @@ -471,8 +471,8 @@ path: aws-lc # versioning=semver-coerced repository: aws/aws-lc - ref: v1.42.0 - - uses: lukka/get-cmake@56d043d188c3612951d8755da8f4b709ec951ad6 # v3.31.6 + ref: v1.49.1 + - uses: lukka/get-cmake@28983e0d3955dba2bb0a6810caae0c6cf268ec0c # v4.0.0 - name: "AWS-LC: build" run: | mkdir build