From patchwork Wed Feb 12 13:54:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "d12fk (Code Review)" X-Patchwork-Id: 4130 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:948d:b0:5e7:b9eb:58e8 with SMTP id g13csp957495mal; Wed, 12 Feb 2025 05:54:27 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXy42QaHbWkoA+ZX9AhULNDGJRKqCRa0HDxNHXGb7ehCoabuzuFKfB/0N/9p+vDWgjuerfq9VPE5Sc=@openvpn.net X-Google-Smtp-Source: AGHT+IF+a7DxXjNkqpADPSrZakxITJd0a1rE9Qsob91+yRXAINLTsgywu2RudFMGDRygU7hwsSP0 X-Received: by 2002:a05:6830:65c1:b0:726:e8b1:bed5 with SMTP id 46e09a7af769-726f1a62ffbmr2609812a34.0.1739368467245; Wed, 12 Feb 2025 05:54:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739368467; cv=none; d=google.com; s=arc-20240605; b=LRM4FKVlefI4ghHFelVRySbSiAMbYqqmwQqaW3q8deAeL613JE92hV8h2RU37IHV6e qMP8XW3yNVn2701s3cS2zQfw10lH6WB9LcGSsYoa9hzbKDuHnvk1Xz+RPyJCblJXhNjm raJGEn/BV2B1F6bLm7l2WLZfVu/dypMzfRDv7PCVU3KXkwJtufdt2mhSR7tKN2WgJt3D y88/Gw1b/ExuS2d0BiB0YXc4uP2ZyAgSzJNMYRQO9sH8shx/oS4rVU7bRL/6MNh3gDkI aHanBWK6mjMiOGfTekdzJdUVG/PM4Edb+WGjO3xj3fOSp9B5nWMKs684yorj+WfeADn1 ae0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :mime-version:message-id:references:auto-submitted:to:date:from :dkim-signature:dkim-signature:dkim-signature; bh=V43/ImOPLsC2dQi0csopwcYW9Uqt0tml3PVB9AtgURk=; fh=GFP4qDxgyJ2WEPo/oeLZg3Mj4NqvY1j2nTvTt7psNwg=; b=RlLHPnV2q+l+sNNRRylI4zh3dziN8Bzz8jo65r5+/Lrg+W619D7R3U8RWXXlpIp49k 2JwubVvSCpTrbq0R8EcUvUxkxlsgLh1GQ+3H8UYwHACeDRO73iWjKISJwId4MTQbArE5 MnMhuUN7HQI4IzGSOht+j+HhjtF+HQPMoLV1Y9OH8CscGiXGgGgq90+4ku4Z8VBICsKr eA5wReW2p31AZWenNDXp9IFUxvkr29jruLyFYK75tUNEsgCFnxjFUOYfjfAxLD9JPqm1 u8N60ufnDBS1FLr+NzxRBvysh2GBojZp2Tr4WXLLPIeeUAFAnHRginIni7inHSGkyzdP NIZA==; 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=bGQDZ3HX; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=UkZr+E7u; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=e9DIWBoL; 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=openvpn.net; dara=fail header.i=@openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 46e09a7af769-726af8fcfe8si11649440a34.23.2025.02.12.05.54.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Feb 2025 05:54:27 -0800 (PST) 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=bGQDZ3HX; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=UkZr+E7u; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=e9DIWBoL; 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=openvpn.net; dara=fail header.i=@openvpn.net 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 1tiDC3-0006Il-Nv; Wed, 12 Feb 2025 13:54:23 +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 1tiDC1-0006If-Vi for openvpn-devel@lists.sourceforge.net; Wed, 12 Feb 2025 13:54:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Content-Transfer-Encoding:MIME-Version :Message-ID:Reply-To:References:Subject:List-Unsubscribe:List-Id:Cc:To:Date: From:Sender:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help: List-Subscribe:List-Post:List-Owner:List-Archive; bh=o9SsQ4jt96Exgwu9UzMgB8ZA2drYpYWmZp9zVb1h5So=; b=bGQDZ3HXxPun12YaaVwOlcE2K3 hVFt6p39BRB5xH+IyTXCGfbmmNkapPCcNbcHLppFVMQpE5nC2Wj+EjIsRs9JrxLdO47gMxtCRA2pS tQ38QPFKaf7r47dSuZJR5oCRLE+jQ+rmwa7ayXZwq3eo5jtOy73G5ghGmOteyzoE2zUM=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Reply-To: References:Subject:List-Unsubscribe:List-Id:Cc:To:Date:From:Sender:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help:List-Subscribe:List-Post: List-Owner:List-Archive; bh=o9SsQ4jt96Exgwu9UzMgB8ZA2drYpYWmZp9zVb1h5So=; b=U kZr+E7usURxpQwg5WgYnLfQRDRPW/m+66shlDcJfA4edVelmSzvrihPfBUAmo5V9pzNjWpKp1ZjLl Cb5F3whM0sJmw/4IWffXL/p6JrHobml5v5ftSCFyJGPsZiNYmMsLUraZxS00R2M/2zWi0VcmEF1aF UP84QdSTfZeOpbrc=; Received: from mail-wr1-f48.google.com ([209.85.221.48]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1tiDC0-0002r8-H6 for openvpn-devel@lists.sourceforge.net; Wed, 12 Feb 2025 13:54:21 +0000 Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-38f1e8efe82so618011f8f.0 for ; Wed, 12 Feb 2025 05:54:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1739368449; x=1739973249; darn=lists.sourceforge.net; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from:from:to:cc :subject:date:message-id:reply-to; bh=o9SsQ4jt96Exgwu9UzMgB8ZA2drYpYWmZp9zVb1h5So=; b=e9DIWBoLPFIUbOwZMZBGfDgrWSHze8tlF7gG0/giFjb/DndyLJBNc5n+4+1sagVCu4 6jnfh5owvecfCV/n/QdUx6ZRTWmVN379xanqvUXcw5PFeVKoEneAqipC51P6tXkUKqX+ SRwRbiC+ssjbl/l9LRf85axKrtAbLak9fUfmQD9+BLm5IovCR+CjF4EgwY9p8VamJ7Tn NsqU3MIx++aXsIEXLyejJdnl/8rRD03XZb1yO3PqfXfq6viXp5dOHaKtHjJegrHCDqhT FymAK1YUguPpkF/HP/ArSV/tF2oJH0Nb7bcPRO+VgJjeR0lG7PMHOK6urDRELu1zlEGx 58Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739368449; x=1739973249; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=o9SsQ4jt96Exgwu9UzMgB8ZA2drYpYWmZp9zVb1h5So=; b=OfR0ZVE6qhUsjVh/vWVJRqACWyShUwG5DGU82lWXAQhjPt0Hgtt4CrCJudympj8/f1 sLl1aKBN2urc3gCgpDk8aCR4Xh2sKxcGLr2FyQLUE09rKCslPNIxcjfJkhwE4E94lgck So1hIXJT2epRsRcOkWfZ9461QV+ryKgmOp6XYpEXSANcmkOEy8DWoO6CpI2qkPGjW/uz xCAD0BxwH1xcL7AbvEfNt6LIjOhKghnBS92g/ovgOc2BB+b+ZIb3vNRpH20kPfZIlL7H z6dJ7gfpf0tWAmH6X84zwS3apcBqovJJq9CqjAUOqLec4EgfKhy8pq5ImljruzYRNZ4s skPA== X-Gm-Message-State: AOJu0YwA2xy4vGk3ImanoGfpCqu+zvKmlQeF1MwtamV2KkbbPEh9RTTL Tlpdd0AL/DowNFLWkNlIBfaIL0lBkl7mgpkRFjKIoTippm2meQxqX+DraiCIJ7pZ5ZZYNklEzky 2 X-Gm-Gg: ASbGncsx9onc63U5MmXb3iAcGwM0l0haBrKruGJCyRaRpSScvzRoRICxNjniMmFe/t9 z8Urwb/am8SXBFcanMULNL9xX7hu9mtEKHqR4tmS/is1ln5rPXgO0Y6sIP0914oysCGg+HFmJY+ rXqWmVFF48T+Wi5L5lu317B4nYkEiFUSBwZLxs5KZ5SF+yc8zRBKC38axcJLHtWU1R32kZSjYag TmetnCtJvSX/n+o2n0TyX82YPVS6RtR/vQlJ8hPo5rboGV0DEWmzgsraqk0eIgIZx5PlzG5OsOi 0FOFlvG/SdfYRZDnyVfTuIJl6o1lldyehLO93RH9Hprh5/RgR2I1CG5tkXCTVBfaqV04XW1rh/a ptuW5EKc= X-Received: by 2002:a5d:6d01:0:b0:38d:dce1:f207 with SMTP id ffacd0b85a97d-38dea2cf7b4mr3286126f8f.44.1739368448324; Wed, 12 Feb 2025 05:54:08 -0800 (PST) Received: from gerrit.openvpn.in (ec2-18-159-0-78.eu-central-1.compute.amazonaws.com. [18.159.0.78]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4395a04ce12sm21224445e9.3.2025.02.12.05.54.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2025 05:54:08 -0800 (PST) From: "flichtenheld (Code Review)" X-Google-Original-From: "flichtenheld (Code Review)" X-Gerrit-PatchSet: 1 Date: Wed, 12 Feb 2025 13:54:07 +0000 To: plaisthos Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: I29b68675143988c3304395d9d5ec62289cf519a7 X-Gerrit-Change-Number: 892 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: c26b2e2c5581ad4e14b737df9178a03d6403a5f7 References: Message-ID: <21341a60c4b914edff1d72da05ce8e2249748fab-HTML@gerrit.openvpn.net> MIME-Version: 1.0 User-Agent: Gerrit/3.8.2 X-Spam-Score: -0.2 (/) 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: Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [209.85.221.48 listed in sa-accredit.habeas.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 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. [209.85.221.48 listed in bl.score.senderscore.com] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.221.48 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.48 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 WEIRD_PORT URI: Uses non-standard port number for HTTP 0.0 HTML_MESSAGE BODY: HTML included in message -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1tiDC0-0002r8-H6 Subject: [Openvpn-devel] [M] Change in openvpn[master]: GHA: Drop Ubuntu 20.04 and other maintenance 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: , Reply-To: frank@lichtenheld.com, arne-openvpn@rfc2549.org, openvpn-devel@lists.sourceforge.net Cc: openvpn-devel Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1823860029924339751?= X-GMAIL-MSGID: =?utf-8?q?1823860029924339751?= X-getmail-filter-classifier: gerrit message type newchange 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/+/892?usp=email to review the following change. Change subject: GHA: Drop Ubuntu 20.04 and other maintenance ...................................................................... GHA: Drop Ubuntu 20.04 and other maintenance - Drop Ubuntu 20.04 GHA runners will go away in April 2025 - Change ubuntu-latest to ubuntu-24.04 to make sure we are not surprised by future changes. - Update vcpkg digest to latest 33e9c99 - Update github actions to latest Change-Id: I29b68675143988c3304395d9d5ec62289cf519a7 Signed-off-by: Frank Lichtenheld --- M .github/workflows/build.yaml M .github/workflows/coverity-scan.yml 2 files changed, 10 insertions(+), 40 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/92/892/1 diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3ebea79..8fd1325 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -27,7 +27,7 @@ - name: Show changes on standard output run: git diff working-directory: openvpn - - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: uncrustify-changes.patch path: 'openvpn/uncrustify-changes.patch' @@ -54,7 +54,7 @@ - name: Restore from cache and install vcpkg uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5 with: - vcpkgGitCommitId: 80d54ff62d528339c626a6fbc3489a7f25956ade + vcpkgGitCommitId: 33e9c99208736b713cabe4490e15235f62f893d4 vcpkgJsonGlob: '**/mingw/vcpkg.json' - name: Run CMake with vcpkg.json manifest @@ -64,7 +64,7 @@ buildPreset: mingw-${{ matrix.arch }} buildPresetAdditionalArgs: "['--config Debug']" - - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: openvpn-mingw-${{ matrix.arch }} path: | @@ -72,7 +72,7 @@ ${{ github.workspace }}/out/build/mingw/${{ matrix.arch }}/Debug/*.dll !${{ github.workspace }}/out/build/mingw/${{ matrix.arch }}/Debug/test_*.exe - - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: openvpn-mingw-${{ matrix.arch }}-tests path: | @@ -106,16 +106,12 @@ strategy: fail-fast: false matrix: - os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04] + os: [ubuntu-22.04, ubuntu-24.04] sslpkg: [libmbedtls-dev] ssllib: [mbedtls] libname: [mbed TLS] include: - - os: ubuntu-20.04 - sslpkg: "libssl-dev" - libname: OpenSSL 1.1.1 - ssllib: openssl - os: ubuntu-22.04 sslpkg: "libssl-dev" libname: OpenSSL 3.0.2 @@ -128,32 +124,6 @@ ssllib: openssl pkcs11pkg: "libpkcs11-helper1-dev softhsm2 gnutls-bin" extraconf: --enable-pkcs11 - - os: ubuntu-20.04 - sslpkg: "libssl-dev" - libname: OpenSSL 1.1.1 - ssllib: openssl - pkcs11pkg: "libpkcs11-helper1-dev softhsm2 gnutls-bin" - extraconf: "--enable-iproute2 --enable-pkcs11" - - os: ubuntu-20.04 - sslpkg: "libssl-dev" - libname: OpenSSL 1.1.1 - ssllib: openssl - extraconf: "--enable-async-push" - - os: ubuntu-20.04 - sslpkg: "libssl-dev" - libname: OpenSSL 1.1.1 - ssllib: openssl - extraconf: "--disable-management" - - os: ubuntu-20.04 - sslpkg: "libssl-dev" - libname: OpenSSL 1.1.1 - ssllib: openssl - extraconf: "--enable-small" - - os: ubuntu-20.04 - sslpkg: "libssl-dev" - libname: OpenSSL 1.1.1 - ssllib: openssl - extraconf: "--disable-lzo --disable-lz4" name: "gcc - ${{matrix.os}} - ${{matrix.libname}} ${{matrix.extraconf}}" env: @@ -182,7 +152,7 @@ strategy: fail-fast: false matrix: - os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04] + os: [ubuntu-22.04, ubuntu-24.04] ssllib: [mbedtls, openssl] name: "clang-asan - ${{matrix.os}} - ${{matrix.ssllib}}" @@ -268,7 +238,7 @@ runs-on: windows-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - uses: lukka/get-cmake@8567b9d9b63052b8430ef30042e13c3ba5288f16 # v3.31.3 + - uses: lukka/get-cmake@5f6e04f5267c8133f1273bf2103583fc72c46b17 # v3.31.5 - name: Install rst2html run: python -m pip install --upgrade pip docutils @@ -276,7 +246,7 @@ - name: Restore artifacts, or setup vcpkg (do not install any package) uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5 with: - vcpkgGitCommitId: 80d54ff62d528339c626a6fbc3489a7f25956ade + vcpkgGitCommitId: 33e9c99208736b713cabe4490e15235f62f893d4 vcpkgJsonGlob: '**/windows/vcpkg.json' - name: Run CMake with vcpkg.json manifest (NO TESTS) @@ -295,7 +265,7 @@ testPreset: win-${{ matrix.arch }}-release testPresetAdditionalArgs: "['--output-on-failure']" - - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: openvpn-msvc-${{ matrix.arch }} path: | diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index cb70022..3381d8f 100644 --- a/.github/workflows/coverity-scan.yml +++ b/.github/workflows/coverity-scan.yml @@ -9,7 +9,7 @@ # Running coverity requires the secrets.COVERITY_SCAN_TOKEN token # which is only available on the main repository if: github.repository_owner == 'OpenVPN' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Check submission cache id: check_submit