From patchwork Wed Apr 29 09:39:33 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4913 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:cc85:b0:84a:48f:a1fd with SMTP id md5csp95300mab; Wed, 29 Apr 2026 02:39:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AFNElJ/rOPgiFURvQ5eoGamfQBcBNb0zACtULu0/6+8glj0J358DNZiBjA3Ucu6JJ/Y2JpF0oTz66cs+6+c=@openvpn.net X-Received: by 2002:a05:6870:d627:b0:408:694d:ff34 with SMTP id 586e51a60fabf-433f38671cdmr3568715fac.9.1777455594792; Wed, 29 Apr 2026 02:39:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1777455594; cv=none; d=google.com; s=arc-20240605; b=BrlYLibzaz4czN9PGU54xUMTVFQrn4BaDXS4SFuX5nkcOO/bNMKVmEnl+zhtxBf4UK tCLRhUOaerPeO4Y0g7ngdP6q4JyChhCSVbWX4fQbjYEMnF2HeoJfDBi9MqZko+05Rjzw MVMUZCG6XqEHba5EJnerCctNXpQet4LXhy6e3K1rxMAeu0WKGPaab+gNL0BTWDyVD2SS pnDzDerRojl2bjJk5hZtZyGW443M+MsVWcrgNxIQiUODyNJGevZ+iw5Nfx2P6oEa/C1b ZpIMWsELRS7uzWqhYpdtqN5bgBQ8Y4sIA6KZCKrqThyjhZJ0LtmqgXzkdBqRXF0kqetC W/Ng== 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:dkim-signature; bh=rsaRNMNMNkeld5gHv3vHw3wjyoqrOkB4P8kRtH4y8LA=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=e00egZggnxrGVmhYpdv6ppShYtRqw85X7xcR7f7WqbTnm/zLTlHAQ0Y/8x3YtawxBF +khitmJFf5VlkmzqEOU4H/HHSLJJnSLNP8Gi5WPVPg+lrluND7grSu2npXy+IfaIpUTY IgvYjXsc+uvI6JkhuyOQjkywN0WpZBLsedsSClJWM2kj1u0GnUzNXJ+4GDwJwqBtmMm6 ASOcAQAyDIwyeikiD/c/U0vMvJJ2yFbAdLLz8dHtgRWUf8nMrH9ks1WXQGn+qkIJoiLh 9T5lQkn7KkSyFoTHgNXB8YAIgFcjlR0HgvI1TRMzF7KSGBO9XyuvCiSGM6T+qX7LQGFd 2Jrw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=dMO0NVjv; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=PiJG+Kf0; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=J8RQRsV8; 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 586e51a60fabf-4340eaf8caesi1137179fac.378.2026.04.29.02.39.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Apr 2026 02:39:54 -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=pass header.i=@lists.sourceforge.net header.s=beta header.b=dMO0NVjv; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=PiJG+Kf0; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=J8RQRsV8; 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 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From:Sender: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rsaRNMNMNkeld5gHv3vHw3wjyoqrOkB4P8kRtH4y8LA=; b=dMO0NVjvFkmeRcd8yIBd4Yp3Nx yRiG4X7duBmXVDtPe8K9EVJ2Hckba64nVfKhNzl5LiVO+9gOHb8sMLzvzwBuFIx4YoyN4v4zOoPK1 2s3TtXCGX42h4iqjjewi1VTnBdTaPoJun/fZKzfpG7mBfEotGVU0i5t0HZKV4hwnMUuk=; 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 1wI1OY-0000zx-JR; Wed, 29 Apr 2026 09:39:50 +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 1wI1OW-0000zl-2r for openvpn-devel@lists.sourceforge.net; Wed, 29 Apr 2026 09:39:48 +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=nSHiFa7ac9eT6GH4tjxYzJbtN5XyfL0LxwjtM4epVsc=; b=PiJG+Kf0ooGhLM35bTWS2y7zkP yPDBhxRG+9PEQDp8tYqcDipXncAlBh5CkcXBxIjxSefemH3iRyCa4WGQ4xJwDnrOAxCdgVl2hypA/ mEg/xLMnbOWbPa+sFLhr2dwGfWYKhC5dZp5+whd24y46OKZIcX2kv0pO1Xh6ZartmH2Q=; 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=nSHiFa7ac9eT6GH4tjxYzJbtN5XyfL0LxwjtM4epVsc=; b=J8RQRsV8HWGCKCfoDhsyUKGu5K +gAE4/eWlByJEazun8QMlwVFGCK2lJUun7isMHQBK6oytpO9/0Vq/Z/jyjjA9lDIkWpCHhl0TVu7p SeLQ/980dh2bBYZoG60Ok+Rv4oJI8JN/9Kxr1omFJoDW5etwkLsUcaURXylbcS2BZUTQ=; Received: from [193.149.48.129] (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 1wI1OU-00009m-6c for openvpn-devel@lists.sourceforge.net; Wed, 29 Apr 2026 09:39:48 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.18.1/8.18.1) with ESMTP id 63T9ddsg023665 for ; Wed, 29 Apr 2026 11:39:39 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.1/8.18.1/Submit) id 63T9dd7e023664 for openvpn-devel@lists.sourceforge.net; Wed, 29 Apr 2026 11:39:39 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Wed, 29 Apr 2026 11:39:33 +0200 Message-ID: <20260429093938.23601-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.52.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-2.hosts.colo.sdot.me", 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 The nice automatic caching was removed last year, so go back to manual caching of the binary cache dir. While here, also update vcpkg to latest master. Content analysis details: (1.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-Headers-End: 1wI1OU-00009m-6c Subject: [Openvpn-devel] [PATCH v1] GHA: Add caching for vcpkg 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?1863797277723215647?= X-GMAIL-MSGID: =?utf-8?q?1863797277723215647?= From: Frank Lichtenheld The nice automatic caching was removed last year, so go back to manual caching of the binary cache dir. While here, also update vcpkg to latest master. Change-Id: I933227aa4bc4f05b58d0e754b4330da807504d01 Signed-off-by: Frank Lichtenheld Acked-by: Yuriy Darnobyt Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1642 --- 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/+/1642 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 895f469..b530fcc 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -42,14 +42,23 @@ VCPKG_DEFAULT_TRIPLET: ${{ matrix.vcpkg_triplet }} VCPKG_ROOT: ${{ github.workspace }}/vcpkg VCPKG_INSTALLED_DIR: ${{ github.workspace }}/vcpkg/installed + VCPKG_BINARY_SOURCES: clear;default,readwrite + VCPKG_GIT_COMMIT_ID: 031f4afe03be385aee354f15be6e6b1fe57497c7 steps: - name: Checkout OpenVPN uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - uses: lukka/get-cmake@7bfc9baacbbdcb5e37957ad05c3546b3e222be3c # v4.3.2 - - name: Install vcpkg + - name: Setup vcpkg uses: lukka/run-vcpkg@b1a0dd252f06b9e25b3c022a9a03bd7a427fb6a2 # v11.6 with: - vcpkgGitCommitId: e5a1490e1409d175932ef6014519e9ae149ddb7c + vcpkgGitCommitId: ${{ env.VCPKG_GIT_COMMIT_ID }} + - name: Set up vcpkg binary cache + uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 + with: + path: ${{ env.VCPKG_DEFAULT_BINARY_CACHE }} + key: android-${{ matrix.abi }}-vcpkg-binary-cache-${{ env.VCPKG_GIT_COMMIT_ID }} + restore-keys: | + android-${{ matrix.abi }}-vcpkg-binary-cache- - name: Install dependencies run: ${VCPKG_ROOT}/vcpkg install openssl lz4 cmocka - name: configure OpenVPN with cmake @@ -70,10 +79,12 @@ arch: [x86, x64] build: [Release, Debug] - name: "gcc-mingw - ${{ matrix.arch }} - ${{matrix.build }} - OSSL" + name: "gcc-mingw - ${{ matrix.arch }} - ${{ matrix.build }} - OSSL" runs-on: ubuntu-24.04 env: VCPKG_ROOT: ${{ github.workspace }}/vcpkg + VCPKG_BINARY_SOURCES: clear;default,readwrite + VCPKG_GIT_COMMIT_ID: 031f4afe03be385aee354f15be6e6b1fe57497c7 steps: - name: Install dependencies run: sudo apt update && sudo apt install -y mingw-w64 unzip build-essential wget python3-docutils man2html-base @@ -81,12 +92,21 @@ uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - uses: lukka/get-cmake@7bfc9baacbbdcb5e37957ad05c3546b3e222be3c # v4.3.2 - - name: Restore from cache and install vcpkg + - name: Setup vcpkg uses: lukka/run-vcpkg@b1a0dd252f06b9e25b3c022a9a03bd7a427fb6a2 # v11.6 with: - vcpkgGitCommitId: e5a1490e1409d175932ef6014519e9ae149ddb7c + vcpkgGitCommitId: ${{ env.VCPKG_GIT_COMMIT_ID }} vcpkgJsonGlob: '**/mingw/vcpkg.json' + - name: Set up vcpkg binary cache + uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 + with: + path: ${{ env.VCPKG_DEFAULT_BINARY_CACHE }} + key: mingw-${{ matrix.arch }}-vcpkg-binary-cache-${{ hashFiles('**/mingw/vcpkg.json') }}-${{ env.VCPKG_GIT_COMMIT_ID }} + restore-keys: | + mingw-${{ matrix.arch }}-vcpkg-binary-cache-${{ hashFiles('**/mingw/vcpkg.json') }}- + mingw-${{ matrix.arch }}-vcpkg-binary-cache- + - name: Run CMake with vcpkg.json manifest uses: lukka/run-cmake@5d55ea7949e25f69f0ecb516d8d572297e03a956 # v10.9 with: @@ -262,6 +282,8 @@ name: "msbuild - ${{ matrix.arch }} - openssl" env: BUILD_CONFIGURATION: Release + VCPKG_BINARY_SOURCES: clear;default,readwrite + VCPKG_GIT_COMMIT_ID: 031f4afe03be385aee354f15be6e6b1fe57497c7 runs-on: windows-2025 steps: @@ -271,12 +293,22 @@ - name: Install rst2html run: python -m pip install --upgrade pip docutils - - name: Restore artifacts, or setup vcpkg (do not install any package) + - name: Setup vcpkg (do not install any package) uses: lukka/run-vcpkg@b1a0dd252f06b9e25b3c022a9a03bd7a427fb6a2 # v11.6 with: - vcpkgGitCommitId: e5a1490e1409d175932ef6014519e9ae149ddb7c + vcpkgGitCommitId: ${{ env.VCPKG_GIT_COMMIT_ID }} vcpkgJsonGlob: '**/windows/vcpkg.json' + - name: Set up vcpkg binary cache + uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 + with: + path: ${{ env.VCPKG_DEFAULT_BINARY_CACHE }} + key: msvc-${{ matrix.arch }}-vcpkg-binary-cache-${{ hashFiles('**/windows/vcpkg.json') }}-${{ env.VCPKG_GIT_COMMIT_ID }} + restore-keys: | + msvc-${{ matrix.arch }}-vcpkg-binary-cache-${{ hashFiles('**/windows/vcpkg.json') }}- + msvc-${{ matrix.arch }}-vcpkg-binary-cache- + + - name: Run CMake with vcpkg.json manifest (NO TESTS) uses: lukka/run-cmake@5d55ea7949e25f69f0ecb516d8d572297e03a956 # v10.9 if: ${{ matrix.arch == 'arm64' }} diff --git a/renovate.json b/renovate.json index 809ac3f..3bd0917 100644 --- a/renovate.json +++ b/renovate.json @@ -27,7 +27,7 @@ "/^\\.github/workflows/.+\\.ya?ml$/" ], "matchStrings": [ - "vcpkgGitCommitId:\\s*(?.*?)\\n" + "VCPKG_GIT_COMMIT_ID:\\s*(?.*?)\\n" ], "currentValueTemplate": "master", "depNameTemplate": "vcpkg",