From patchwork Fri Dec 6 11:10:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13896997 Received: from fhigh-b8-smtp.messagingengine.com (fhigh-b8-smtp.messagingengine.com [202.12.124.159]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 22D4F1F03F6 for ; Fri, 6 Dec 2024 11:10:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.159 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733483436; cv=none; b=tckS5NwXC9KFzpGBTmDyCYbbu+/4NKGwNxcXF625L7A/S+wDMMIFa+GefkKj9vzpwjK7erP4x76xchVV/5hMU/mg1KorCcdBsfEo3ARhaEWK38gWBPn3mN7ZBOgrVe1mnliYKIIGmiPWpfmqXkjLoyRWBAPM+CR0qbRWZnljZX8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733483436; c=relaxed/simple; bh=NqVbaJi+uxrcPG5Zk/W8wWKSdAFa5mDyiaIv8JB4wF4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ANKzqLUFyusWk+u/kvk0+yxV7fsApkl9aIC/sIhhts9JdrIyvZP93cNbPMRbGzAMid5bwaqTByEZINVRbKmMIV9DCS+qKpQlTJoR8oD6H+Dd9JZJrAFXOZrbJ6OaFo6C9caeIfh8Diyn9h848zZ54es2aQUyZg9ZP2O20YmJDZE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=JlVb6Etb; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=smD3cyad; arc=none smtp.client-ip=202.12.124.159 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="JlVb6Etb"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="smD3cyad" Received: from phl-compute-07.internal (phl-compute-07.phl.internal [10.202.2.47]) by mailfhigh.stl.internal (Postfix) with ESMTP id 39B0A25401E2 for ; Fri, 6 Dec 2024 06:10:33 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-07.internal (MEProxy); Fri, 06 Dec 2024 06:10:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1733483433; x=1733569833; bh=EMhHdp03G3XmOaYu9ioqu0bpzLGnkdaNUro7FfitjWo=; b= JlVb6EtbeB2qJGm5eHvrio3xjr/oZBSpQZBSaTuHw5Sw8/N9na1ZxLVl01QyUtai DN9fAoZI38OUBhgd/doqFY0vUCKa/sOfCXi5CT6+T/ECQvuoFYJ3DadGvyqI3pWr 9T+3CzHxcz7fveABiCsb2EDQSHGAO55kOa5n6009uf3fQ7KMyna4m7QiV9/DnJYb lYOxVBGVqWA3O/3Pitds4RfzGrk8HmCiXpolYokjBEDfidZ48iW+laOm/tM+bseL VqGa8weUTLPzUWj4VeKBoT6b5mIjKb0u5+LDDDxzFJMdcFV5z/+7eDK0tQKs5rAz jzIh6OAp7ZiTL0GA38CjCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1733483433; x= 1733569833; bh=EMhHdp03G3XmOaYu9ioqu0bpzLGnkdaNUro7FfitjWo=; b=s mD3cyadIYFT6p4rCooXA1d/5MhLKEYOcmTpNzPVbdMcV7oOISK7pTvd6b8TgSX0m K+TYKH9aE2mDvm1fU2rmU+ewVI7DVf8su1PstqJDEsbsHf0QL/IfXtQmju8uLRhO 91tvJ08zc7TQb/W2hu3YJbzFkod4spCSUNvs4/yOafZT9spttAHnkzhnD3QvLJZq 8cZaTJEOMrDi+pq/rI8GXGLJgJGs8knjaoQE0ivXrnm3503bI/5SpVnk5M8nzt0I S2yRYt7UIRpobJ6WjIh8qEBTHSeriuASi4l5DsEp40td8fPy+VzHhoeO1q/ubOH/ ZceGHk/f4izGwtyTLchiw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrieelgddvfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdpuffr tefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhephfffufggtg fgkfhfjgfvvefosehtjeertdertdejnecuhfhrohhmpefrrghtrhhitghkucfuthgvihhn hhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrhhnpeffueeiudejvd ekheeuvdekfeffiedvueelteekudehjeetkeegvddugfdtgfeileenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehpshesphhkshdrihhmpdhnsg gprhgtphhtthhopedupdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehgihhtsehv ghgvrhdrkhgvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 6 Dec 2024 06:10:32 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 86543c46 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 6 Dec 2024 11:09:05 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 06 Dec 2024 12:10:13 +0100 Subject: [PATCH 1/4] gitlab-ci: update macOS images to Sonoma Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241206-pks-ci-section-fixes-v1-1-7ab1b69e3648@pks.im> References: <20241206-pks-ci-section-fixes-v1-0-7ab1b69e3648@pks.im> In-Reply-To: <20241206-pks-ci-section-fixes-v1-0-7ab1b69e3648@pks.im> To: git@vger.kernel.org Cc: X-Mailer: b4 0.14.2 The macOS Ventura images we use for GitLab CI runners have been deprecated. Update them to macOS 14, aka Sonoma. Signed-off-by: Patrick Steinhardt --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 526ecfe030a43e0a5a83ddd35cb7c96d46ab2485..61c56ccac8fdc940075d91dd4cb0b54ee33d5199 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,10 +99,10 @@ test:osx: parallel: matrix: - jobname: osx-clang - image: macos-13-xcode-14 + image: macos-14-xcode-15 CC: clang - jobname: osx-reftable - image: macos-13-xcode-14 + image: macos-14-xcode-15 CC: clang artifacts: paths: From patchwork Fri Dec 6 11:10:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13896996 Received: from fhigh-b8-smtp.messagingengine.com (fhigh-b8-smtp.messagingengine.com [202.12.124.159]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 22CE71DA0ED for ; Fri, 6 Dec 2024 11:10:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.159 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733483435; cv=none; b=E/VLWG5Ly6Q7/bWlh24LR3/npx8LedS344DVw2FVq02gqfS9AMrc5A/WHLSVTzwPpDp1R80I3PqFMzHGkb4YyDJCgNjZZuGKSS1avqM1FNXKtiSCYZVdjJJHn5vUp2d9ZBSJJC3kWEVFS0TD4mB1UwYsCngJwo7RGGkBYQhU/G4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733483435; c=relaxed/simple; bh=/fPSMBQRI4/hyM+oil+aXJ5+p6+tRsmR7CCvatq0MVs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=a6MrRDzk98l/qYcOkb5iVEtHhRwk42ysb/mUGSmbcPt/0U9EjUKPe9x9ShxIDm4/ZRNVLYXnhHWvxofjwgtkeMFEDWyWuMcsuKlUOpzvYZKFnS/o2JziMTtBwBxuAZZHtUspWobkGyFYBy5e1BnA2XUgYwBzOJBKMeq161m2/3A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=reVBpsNo; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=NC4Y8eM7; arc=none smtp.client-ip=202.12.124.159 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="reVBpsNo"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="NC4Y8eM7" Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfhigh.stl.internal (Postfix) with ESMTP id 5AF6725401E6 for ; Fri, 6 Dec 2024 06:10:33 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-11.internal (MEProxy); Fri, 06 Dec 2024 06:10:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1733483433; x=1733569833; bh=+/EFK/EHv0Sv4d0xiYwgFcjRqRH31A5hY8d21r+hMts=; b= reVBpsNor0061kIzqyHOn2p9bYOEWdNMFuebg2GUMR0bZhxXlMgM1tQUPbxtK/s4 Gb0KtIrLcCancLZE9/rQYm9l2RrMInWQKM1sot5VkDquowkBej2H/2f0p3wuuHwN ca5SrhIxwuWm54/cNFHVhOg8MWnZuD3JOmu/uhfvmPYJZIy0+9Kpmx22f4aeNQUp Y/nuu3VGn1w3hCCTB9OOyS9Rfqv2HWxT+jr9BmiTjMkXAPW76WnneU2/XiThUBml gP4FAYj61CfaKx3JjtlD/WKODO1Mf2q/byfKnq3onfZoeeAWCaSNC9YZNLvGCqXV O0Yg8bHlBW3y1OU5B4OZYw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1733483433; x= 1733569833; bh=+/EFK/EHv0Sv4d0xiYwgFcjRqRH31A5hY8d21r+hMts=; b=N C4Y8eM73eWsKm5QHenR/xXbwKYB7ibSC1IKjmnnOzUmFgrErTac9Xb+u0q3F38X6 T8QD9EkRLGLMWLGNuGxN3WuIO7GHrxQix3Q0y0Gg0Bn0YmHuEbhVJsRJ2f4UoKxA Qqzm/FlGLLJ/zLkBnSVw/3D91v02f1NKQSteuK6Yx4hHf3HWR4AH0c2CjyiAWShT qqrLFH/ZBmGTmGPK2f+gPF3uAavQC3iErBjeVaVeeyTscLfq6L77/8Gv0fU3gdy0 Qzg3YLpfZshFXLPx+vLSex/y7lK9t9J5WHKaBlOwpputgr9eBlUl1CkuZR6B8+1m +zsDdhcKxkNjvJpn8OxRg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrieelgddvfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdpuffr tefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhephfffufggtg fgkfhfjgfvvefosehtjeertdertdejnecuhfhrohhmpefrrghtrhhitghkucfuthgvihhn hhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrhhnpeffueeiudejvd ekheeuvdekfeffiedvueelteekudehjeetkeegvddugfdtgfeileenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehpshesphhkshdrihhmpdhnsg gprhgtphhtthhopedupdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehgihhtsehv ghgvrhdrkhgvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 6 Dec 2024 06:10:32 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id bb4d49d6 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 6 Dec 2024 11:09:06 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 06 Dec 2024 12:10:14 +0100 Subject: [PATCH 2/4] ci/lib: remove duplicate trap to end "CI setup" group Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241206-pks-ci-section-fixes-v1-2-7ab1b69e3648@pks.im> References: <20241206-pks-ci-section-fixes-v1-0-7ab1b69e3648@pks.im> In-Reply-To: <20241206-pks-ci-section-fixes-v1-0-7ab1b69e3648@pks.im> To: git@vger.kernel.org Cc: X-Mailer: b4 0.14.2 We exlicitly trap on EXIT in order to end the "CI setup" group. This isn't necessary though given that `begin_group ()` already sets up the trap for us. Remove the duplicate trap. Signed-off-by: Patrick Steinhardt --- ci/lib.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/lib.sh b/ci/lib.sh index 930f98d7228166c37c236beb062b14675fb68ef3..a54601be923bf475ba1a9cafd98bb1cb71a10255 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -56,7 +56,6 @@ group () { } begin_group "CI setup" -trap "end_group 'CI setup'" EXIT # Set 'exit on error' for all CI scripts to let the caller know that # something went wrong. From patchwork Fri Dec 6 11:10:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13896998 Received: from fout-b6-smtp.messagingengine.com (fout-b6-smtp.messagingengine.com [202.12.124.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D1C71FBE81 for ; Fri, 6 Dec 2024 11:10:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.149 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733483436; cv=none; b=rt+ByqOG3405SunPiPbIv8Q6iv0UQtaDwN+8bkaHZzaBRjh96r9nf4vWv5YWUN68Kq+7uWhfoD10LKSkwVfaL0QoUE8vdsqXq0wkOFTklEWUqrBXnIhQNbGB6lCCyCcaXBLdtuQrwJyn4Iq7zA1JQLTspg3FgtNoMaxYweXbxcg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733483436; c=relaxed/simple; bh=xOz4TPj2VAUUAYCTbR0O1VBTrvxWRFfZSGNxD+4kgO8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=puvnBIy8UZuSmS3/Q8no/lYcBOvNuk72rpaJuDHR22ZJm7u3yXijtA6CKjR4Cb2y2M/PpzGqT+FZElJ5YlcCI8uUU0CyWALzTnxUQcWyqh8kJvBFUU1mi/5RmyJEyj6ql/BbO65qTQ5ZP+ATwO8UTxKYR2q1MzGNFDmloanOp1g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=Fm+rGNId; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=RFtCBi5D; arc=none smtp.client-ip=202.12.124.149 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="Fm+rGNId"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="RFtCBi5D" Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfout.stl.internal (Postfix) with ESMTP id 4A035114017F for ; Fri, 6 Dec 2024 06:10:34 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-06.internal (MEProxy); Fri, 06 Dec 2024 06:10:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1733483434; x=1733569834; bh=79axibpEIRKEXTiPgxddDCbHXya6JocK3lJMEs+H8FQ=; b= Fm+rGNIdmSac5MUuDWpR8wDP83+PQsdpXfx/XjDdqJPL54Xf82Nt3IiIzlXCxc7z uu2dkRieVdTvx7m2xp2naH/sFFGiUp16LfKLUlUiB0GKypOvZtch15Cy5j90rW9m Hs+I6fzxcTvCY3NfG6LUpMKifSb+8k8bRtpXDrW4EDQnfSmnxpjei3duX1/urhyL c0aDsmzeEZYm4v5Dp2Un8sZDQk+HrKE0LXTB4iTQZjTADQMk51r7k+lIoC1ngGlF lEaJJGOHRcxk9DgT8XcScFod2zOjo9juhhvE901gd8c/XmLY73fTVh4ER1PNy+mw eogcRxcl6iSfKIgttxSpqw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1733483434; x= 1733569834; bh=79axibpEIRKEXTiPgxddDCbHXya6JocK3lJMEs+H8FQ=; b=R FtCBi5DMr+V0QQSzGj/hYQErQH4/UGr9fIW8JSAp5OuV6WGcFKmbcF+ceO+kbCay CN4/vxAfj6UcqPAbD8ws8590SFDPAEEppaVRtUIrtpbKNfal+FiUKXTTzPAXwkWr uh71g0OjYU0hLAO65xe/RXbCqPZMhiNosjwmIUd2VH5uFG81S8GFBDz7RbkYb8UI qOwZ3ARyyrEsIDUHgbnQ62D/OYfyhENsVbH0qCQgWLHH0gUJyqQd6BD5m5irImgh 9eQMcZpE8WxiPTr6GMqOwOpgE1XnXFab38IncIqopTVIjWITrCv8wIgm1oK2lgjj WRfXPVsv9wdK7VMf8dY9g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrieelgddvgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdpuffr tefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhephfffufggtg fgkfhfjgfvvefosehtjeertdertdejnecuhfhrohhmpefrrghtrhhitghkucfuthgvihhn hhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrhhnpeffueeiudejvd ekheeuvdekfeffiedvueelteekudehjeetkeegvddugfdtgfeileenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehpshesphhkshdrihhmpdhnsg gprhgtphhtthhopedupdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehgihhtsehv ghgvrhdrkhgvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 6 Dec 2024 06:10:33 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id fb96c8cc (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 6 Dec 2024 11:09:07 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 06 Dec 2024 12:10:15 +0100 Subject: [PATCH 3/4] ci/lib: use echo instead of printf to set up sections Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241206-pks-ci-section-fixes-v1-3-7ab1b69e3648@pks.im> References: <20241206-pks-ci-section-fixes-v1-0-7ab1b69e3648@pks.im> In-Reply-To: <20241206-pks-ci-section-fixes-v1-0-7ab1b69e3648@pks.im> To: git@vger.kernel.org Cc: X-Mailer: b4 0.14.2 We use printf to set up sections with GitLab CI even though we could trivially use echo. This may cause problems in case the argument passed to `begin_group ()` or `end_group ()` contains formatting directives as we use them as part of the formatting string. Simplify the code to instead use echo. Signed-off-by: Patrick Steinhardt --- ci/lib.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/lib.sh b/ci/lib.sh index a54601be923bf475ba1a9cafd98bb1cb71a10255..ba8f4da39caf29db5edaffde160bc81a7c58c329 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -18,7 +18,7 @@ elif test true = "$GITLAB_CI" then begin_group () { need_to_end_group=t - printf "\e[0Ksection_start:$(date +%s):$(echo "$1" | tr ' ' _)[collapsed=true]\r\e[0K$1\n" + echo "\e[0Ksection_start:$(date +%s):$(echo "$1" | tr ' ' _)[collapsed=true]\r\e[0K$1" trap "end_group '$1'" EXIT set -x } @@ -27,7 +27,7 @@ then test -n "$need_to_end_group" || return 0 set +x need_to_end_group= - printf "\e[0Ksection_end:$(date +%s):$(echo "$1" | tr ' ' _)\r\e[0K\n" + echo "\e[0Ksection_end:$(date +%s):$(echo "$1" | tr ' ' _)\r\e[0K" trap - EXIT } else From patchwork Fri Dec 6 11:10:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13896999 Received: from fhigh-b8-smtp.messagingengine.com (fhigh-b8-smtp.messagingengine.com [202.12.124.159]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 50AC81FCD06 for ; Fri, 6 Dec 2024 11:10:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.159 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733483438; cv=none; b=QfWI2Hm6H3cQE4BN6CZlApEFcLLZhImAJpayMzVrrRaz/8KxeKo4zbojwiySnpwqfDGL8ug9Jo1YSEn2i63BpH7IsRmuSjTEIySoeSmHLdsatu/fm5/9HjeOHPxeHG6yaepLgwYNRjaJJeq5TeqGHvwp5gV6PzlaonJofyWh+6M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733483438; c=relaxed/simple; bh=u07hx1u4y0wBiYcirZGe0GTg0qM9RBGgeuculhUJbl8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KJ6A2r49GWiqa9/iWwfcNJ25A25uKYJmLYQsyh2KC9VbBRZrg9CF4gbXFMteeUqhwn3tFR2Kpz5SqXcoAWR+L0lmh3rgnqPz/9SvWrNZVkYorzyLHKFuYy7v8RygQ034nJeiSugPjnYKFFJr0u8Vtmm30hZnfDbz1KEIjyKzAxk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=H5gpWjjL; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=x4ddvfsz; arc=none smtp.client-ip=202.12.124.159 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="H5gpWjjL"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="x4ddvfsz" Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfhigh.stl.internal (Postfix) with ESMTP id 6D59A254014E for ; Fri, 6 Dec 2024 06:10:34 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-06.internal (MEProxy); Fri, 06 Dec 2024 06:10:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1733483434; x=1733569834; bh=IeUW2dP1J6lb44abFNKJ+S4Z0co4hVVydlQyZL/NfTs=; b= H5gpWjjLb4R0dV00EeAN5Vpn2fNMBbwzFn1zPvO9gCLC0IIhRP6UJFk6xzciTt6M NOUxAxygPK6nu0LhOo5h1T9CISyyTkAkZCCLW0gMqDYXoAio5juy8Crein3qGsR/ kR/peZJU/209dwF2moXInfcL9hINt5ed9gKnccXaZgXFB5ZbeF1tUWhqHSNl6SbV bHrNlqJ9s4kuu4FTaIKZDmMrFc72kby41J8n7vs5KP0LaBNh5K9atXRtfu0O3XXU 7Pi8jJXRTS+LdSJeq7Pt0+DAFQmcImbvpOQTHLqAPyktliZV4T8M7VUf7qEn3fPt L3W4XnfaeCnNCqNqwKX09A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1733483434; x= 1733569834; bh=IeUW2dP1J6lb44abFNKJ+S4Z0co4hVVydlQyZL/NfTs=; b=x 4ddvfszNFS9Riy32XB2zE5pflUyf3m7ebv1D8oNCB5Km53rbT4xH9/cXIGf5fvxF 4k1g8rptgBcSRvGL5jm3e+ezGoBfRx3mrW1ULteanzkZs50+GKccRH9aCMTKj/dN gZ+nHY5PT+oj5HjTQfE7+JNpfgNwoFCnROSVye+nwhc611HjdShdWyBpuazznels CKbUK1F/VUBelvaqHPjYUXRShNfJ5iN9uMZrcGgO9N7tTopW9bew8KSwMBcJliBB 1ChrxG7f3Bhm7ZhWD4bjsQzno2kXJxzAoeczHgM6mN3p5dsN8VpfFXwg5irhEyxT 7Mxjh14nOlpD9s+SqRqtA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrieelgddvgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdpuffr tefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhephfffufggtg fgkfhfjgfvvefosehtjeertdertdejnecuhfhrohhmpefrrghtrhhitghkucfuthgvihhn hhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrhhnpeffueeiudejvd ekheeuvdekfeffiedvueelteekudehjeetkeegvddugfdtgfeileenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehpshesphhkshdrihhmpdhnsg gprhgtphhtthhopedupdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehgihhtsehv ghgvrhdrkhgvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 6 Dec 2024 06:10:33 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 986f1cb3 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 6 Dec 2024 11:09:08 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 06 Dec 2024 12:10:16 +0100 Subject: [PATCH 4/4] ci/lib: fix "CI setup" sections with GitLab CI Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241206-pks-ci-section-fixes-v1-4-7ab1b69e3648@pks.im> References: <20241206-pks-ci-section-fixes-v1-0-7ab1b69e3648@pks.im> In-Reply-To: <20241206-pks-ci-section-fixes-v1-0-7ab1b69e3648@pks.im> To: git@vger.kernel.org Cc: X-Mailer: b4 0.14.2 Whenever we source "ci/lib.sh" we wrap the directives in a separate group so that they can easily be collapsed in the web UI. And as we source the script multiple times during a single CI run we thus end up with the same section name reused multiple times, as well. This is broken on GitLab CI though, where reusing the same group name is not supported. The consequence is that only the last of these sections can be collapsed. Fix this issue by including the name of the sourcing script in the group's name. Signed-off-by: Patrick Steinhardt --- ci/lib.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/lib.sh b/ci/lib.sh index ba8f4da39caf29db5edaffde160bc81a7c58c329..2cdc99e7fd05650ef80715b621b42d15d6b13a12 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -55,7 +55,7 @@ group () { return $res } -begin_group "CI setup" +begin_group "CI setup via $(basename $0)" # Set 'exit on error' for all CI scripts to let the caller know that # something went wrong. @@ -393,5 +393,5 @@ esac MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}" -end_group "CI setup" +end_group "CI setup via $(basename $0)" set -x