From patchwork Thu May 2 12:22:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 3698 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:f212:b0:577:9287:30c5 with SMTP id sk18csp992504mab; Thu, 2 May 2024 05:23:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVpKeAJBjOAeQJeSzoMf1618mzwD2+VYhG5TojOcJJ1xIJrlEZLI4aTzcoLN7GekQ9vhYTIlWx5vaDClKMfcWM+rrARhkM= X-Google-Smtp-Source: AGHT+IFq9VOtIugixUTkcD0+hn2BIcR0xtLKEpjYv7Tays9rcKmBw+iW+ksVAudpaRR+2in/JKzV X-Received: by 2002:a05:6a20:101a:b0:1ad:8f18:8621 with SMTP id gs26-20020a056a20101a00b001ad8f188621mr5515227pzc.6.1714652591429; Thu, 02 May 2024 05:23:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714652591; cv=none; d=google.com; s=arc-20160816; b=xeshR4D4ie37RoSrjT2zkiHzhXrhprzqntoOHwQZ4kfLGifSeu/zb6mqJCd/8wMw4y xFCpKLqwNftqjyOKH+hhIwK6rEsxIWzSBkoF0bfX7OXygKCKUuohtTNTyYWmEvkEZPHH l0onvopFm5cIr8NTsCDSpH43D0ojeT+++NxH+x0SwWOHI2Br3054eQ50qdmvTzTBWF52 jiqyEncJ0ZbPPZcW91b5R00yzkGoXhdBhScrlCJV/3hsO7EAIzwJLgfJYv3CtAo3p4yz cOjQt6l453bQe1TF0A1QRiDIi9RH6YFW218xQRvrTHjHmlBq5SnrVP4PvOgU9NIvM49X RGqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=+rr3K6PDLq9MW72E2jWhr9vHAYGvAUZETrKm0LyeYVs=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=vtpVNgQgzek0hPgh5z5wy6NRInDJeBXauEeHd9Sr7Xn6wzlNw7luf4ERbRDk1iLw6l 8vIz1/SGgNt8i2y8qq55XWHQGWitxJoJHH03CywfB5tOXJwZOxHnFjJEX++/Ldx1S931 q8/kX4+AznX1D12a/PXA+9uMU8mwlRRQI60W6FU/B/kxeZsCJSbbvLHoA/moTGBGn/Ng Izu6Uebw/7weRzu3DlNY2qFnOBwxkrRPwEHB3HOrZ5tOcOu5jn5bq/KccnBHnTmlcZy/ YVbyOmbgalBTCgdgQAQ2sOuuiG5nmrlY74mPzaQEslAkWsKA0U9nJGPBJsTiB/Mwc+vj CWDg==; 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=md+Aqo6B; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=VEpRgwJ5; 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 t1-20020a635341000000b005e2b1e8547csi892878pgl.367.2024.05.02.05.23.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 May 2024 05:23:11 -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=md+Aqo6B; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=VEpRgwJ5; 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-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1s2VSa-0001qF-CH; Thu, 02 May 2024 12:22:49 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1s2VSX-0001pt-IL for openvpn-devel@lists.sourceforge.net; Thu, 02 May 2024 12:22:46 +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=OggGAa8IFw3cvNBEdjnMTjguixgrSDEWVZBbSsCAOco=; b=md+Aqo6Bf5Y2oR7AFSqG5YOGx5 B7345Tb3RRanBLuObEg6BmTLQ1aVfvGMX00TbUopa6mylndPbTZVU3GUPzJXkjmNkiVlB7/HG5kkX qlHNbP1Rs+ma+6Mvyz+xzxHNDTc+nplLTYYCeozEeJSbrGkrR8uU5l8uTTC/KfhDKZd4=; 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=OggGAa8IFw3cvNBEdjnMTjguixgrSDEWVZBbSsCAOco=; b=VEpRgwJ51g2bF1dyoMDgnxidee guTtV2O3dfL54IffUOQYIM+fia4CBcRoKoVanfWJtVxpKHZs6yIuUXbnWDO/P802zLkionWiUP4qk UloZOhU8BbXv3I/TLwnU9DgJA8g3wc3mKVcYc4X6FdhGrQ//ju2ZpXagNM6FI12iFZ5c=; 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 1s2VSW-0007Kj-DG for openvpn-devel@lists.sourceforge.net; Thu, 02 May 2024 12:22:46 +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 442CMWAp000682 for ; Thu, 2 May 2024 14:22:32 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 442CMVLS000681 for openvpn-devel@lists.sourceforge.net; Thu, 2 May 2024 14:22:31 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Thu, 2 May 2024 14:22:31 +0200 Message-ID: <20240502122231.672-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.43.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: Arne Schwabe Github's documentation states: macos-11 label has been deprecated and will no longer be available after 6/28/2024. Add macos14 which is nowadays supported instead. Content analysis details: (0.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 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 RCVD_IN_DNSWL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to DNSWL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [193.149.48.174 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1s2VSW-0007Kj-DG Subject: [Openvpn-devel] [PATCH v1] Replace macos11 with macos14 in github runners 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?1797943555701374955?= X-GMAIL-MSGID: =?utf-8?q?1797943555701374955?= From: Arne Schwabe Github's documentation states: macos-11 label has been deprecated and will no longer be available after 6/28/2024. Add macos14 which is nowadays supported instead. The github macos-14 runner is using the M1 platform with ARM, so this requires a bit more adjustment of paths. Change-Id: Ia70f230b2e9a78939d1875395205c8f48c4944b7 Signed-off-by: Arne Schwabe Acked-by: Frank Lichtenheld --- 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/+/582 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Frank Lichtenheld diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f771f5a..d7c3ecd 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -202,8 +202,16 @@ matrix: ssllib: [ openssl11, openssl3, libressl] build: [ normal, asan ] - os: [macos-11, macos-12, macos-13] + os: [macos-12, macos-13, macos-14] include: + # macos14 and newer runners use ARM CPUs and homebrew uses /opt/homebrew/ + # on ARM instead of /usr/local/ + - os: macos-12 + homebrew: /usr/local/opt + - os: macos-13 + homebrew: /usr/local/opt + - os: macos-14 + homebrew: /opt/homebrew/opt - build: asan cflags: "-fsanitize=address,undefined -fno-sanitize-recover=all -fno-optimize-sibling-calls -fsanitize-address-use-after-scope -fno-omit-frame-pointer -g -O1" ldflags: -fsanitize=address,undefined -fno-sanitize-recover=all @@ -228,8 +236,10 @@ env: CFLAGS: ${{ matrix.cflags }} LDFLAGS: ${{ matrix.ldflags }} - OPENSSL_CFLAGS: "-I/usr/local/opt/${{matrix.libdir}}/include" - OPENSSL_LIBS: "-L/usr/local/opt/${{matrix.libdir}}/lib -lcrypto -lssl" + OPENSSL_CFLAGS: "-I${{matrix.homebrew}}/${{matrix.libdir}}/include" + OPENSSL_LIBS: "-L${{matrix.homebrew}}/${{matrix.libdir}}/lib -lcrypto -lssl" + LZO_CFLAGS: "-I${{matrix.homebrew}}/lzo/include" + LZO_LIBS: "-L${{matrix.homebrew}}/lzo/lib -llzo2" UBSAN_OPTIONS: print_stacktrace=1 steps: - name: Install dependencies