From patchwork Wed Feb 12 21:51:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4133 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:1d8f:b0:5e7:b9eb:58e8 with SMTP id hp15csp192353mab; Wed, 12 Feb 2025 13:52:12 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUjnhvLE+9gw4lNwelikyhD0Ax69rAAJMIvQAAKgIFV5l2ZpS/IMCe1vdhv2rrl6GkadQiW5GpqsCs=@openvpn.net X-Google-Smtp-Source: AGHT+IF3gJ4JOl6J6+bJU6m3+eUW1Apdp/1f1r+K4vB95X4dUomJDMHGHHR4xu3KK8tLe/rCQcdt X-Received: by 2002:a05:6808:f0d:b0:3f3:d66a:215f with SMTP id 5614622812f47-3f3d8dcbefbmr493060b6e.10.1739397132609; Wed, 12 Feb 2025 13:52:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739397132; cv=none; d=google.com; s=arc-20240605; b=jr47tsqLU6fv2nZ0HyKoSxJQFIyR0Gurl3xjF4H1xO4bKvefGNUF5dlCZiUtIo//QU x1ZoBDFwgprlEzLh1OgvH0xW26Z0MaiWM7hfz0wXdGoSE1LabreAS7t+2WcINDsguT8M q1prSci1a2bZbNFDyToFN0X37e+X3S3v0DnY/ekVsdbzRteFr3norzqbPFl004SOHP25 7sgH0EQqeBckQ1XJkDPobdKlZKFOd3PgS1Y4Sfw4CugYi9eNIi5cG8gkURGKg37w36HL sIxYPF2lGLp3SYfWI61e6wDBhm9DFTVMvZIEjDEuNKQmtPpm+zHg9XTE8TCE2LSdCgIk rPZQ== 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=wjiDYguxpBggLnoE9sBPKfaanlnXRWRd/jexwaQCDYw=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=eM0relq7h0Lcm3OGzkqIcQEdqAgDvjweHvc5OpehylbSKx+IdVShVBnDr8+KItB9zw F0k3YtlV3GRINWQErks0r+RBdhzeFZwUBZ+dM1C4q/zGH8faCH8LTO4Y1aEJX/Wv7QZS mcDgR5/ec8VfTIyr1vvfnKd9jFmnbZYkjtzqqntaRb/htMaF6miFTOtyNGu84u77nh2p iEM+igjC9OaMxmXqmDnA53xG6/y6RpKnP+NyVciDB6NrPRH/T3BUQ+LZI8IszGr7mF8T 0RoTrVAuOv6EnxK2O5e/2bgOISsJHu1fCtB1REZDUg9HGb3vQxVvYJDY97On2ZvXt2TG 4Xxw==; 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=gU3sVBXa; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=OuaRWRNj; 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-727002760c9si42663a34.137.2025.02.12.13.52.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Feb 2025 13:52:12 -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=gU3sVBXa; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=OuaRWRNj; 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 1tiKeM-0005g2-2l; Wed, 12 Feb 2025 21:52:06 +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 1tiKeK-0005fw-Kp for openvpn-devel@lists.sourceforge.net; Wed, 12 Feb 2025 21:52:05 +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=7N89e5vsCwQV5ma4uM09h+zPjXA2UWWfgOj4xw0Gj3c=; b=gU3sVBXaAVt6LSAJ2k6gbLjC8/ dHyzIhq4s1gjsVcvrfRdtddQ8P83O9T8hjt/CvCSlDP+7cuwr81RkhFDUeGEm5+HveRS/a4BwRfbr fuUE8udpJcrJKEmBdJGP+4n1GWKNXZ30MQDhwWUO/gwC8Yi29vqfoNG9XUoWE31rMSNs=; 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=7N89e5vsCwQV5ma4uM09h+zPjXA2UWWfgOj4xw0Gj3c=; b=OuaRWRNj+djQqIYSJkYho1d4NV KzFkZj3RPsSMThVRq/UTZqH0czr9lRwkgx+iLx0a57X/LlWEhzbImWnEMlw/vIhgHQcClkSYvaB4f tLKAmRXbWOgVyFX2vdIMFvpVMNZy1d0lcwCt6mIckDWknDmrqeb9YnhH2+vqF/0jhmCo=; 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 1tiKeJ-0003lt-LP for openvpn-devel@lists.sourceforge.net; Wed, 12 Feb 2025 21:52:05 +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 51CLpqGG000629 for ; Wed, 12 Feb 2025 22:51:52 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 51CLpqjO000628 for openvpn-devel@lists.sourceforge.net; Wed, 12 Feb 2025 22:51:52 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Wed, 12 Feb 2025 22:51:51 +0100 Message-ID: <20250212215151.619-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 - 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 [...] Content analysis details: (0.0 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. [193.149.48.174 listed in sa-accredit.habeas.com] 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 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1tiKeJ-0003lt-LP Subject: [Openvpn-devel] [PATCH v1] 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: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1823890087678206969?= X-GMAIL-MSGID: =?utf-8?q?1823890087678206969?= From: Frank Lichtenheld - 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 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/+/892 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 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