From patchwork Tue Dec 10 12:01:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13901357 Received: from fhigh-b3-smtp.messagingengine.com (fhigh-b3-smtp.messagingengine.com [202.12.124.154]) (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 E99EC19E99E for ; Tue, 10 Dec 2024 12:02:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.154 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733832130; cv=none; b=mrBKIZrF09frmjx98F5KeY4msDF1nLCZNucWtPkKSKLaMYPQruFEhk53AmLmscs3Hh/wjMWTmR8wbT75ibnBC0++MuwRjAgaW63WjaLLxR6CV+GsQZNQLYMbb4zhATtwEvYOJQhaLISfqwecnBYPQc5GsmIq4MkEE0ISrzYmAa4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733832130; c=relaxed/simple; bh=n0f1XCJp5sTGtpkm5VwIPJ9goKkSQQ+xmheNRz1SUJ4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ol5M5F5AdNyGvs2YNAh1KbfxqqhHZB26YKUI8HkvAVpcSpDiJBA7HivWjq9oFnsWUVYCAy9o0/2UZa4cLW6Eh/Qqg90wkEuxoUxOv/Cb0Ciau9IoFKgWj2IrURAbRbOTwa075ltpOIf8nLi433tUyxrHugYmRT7ATOVUjtE8hJ0= 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=ZRF/hM2X; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=oD/nqS0l; arc=none smtp.client-ip=202.12.124.154 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="ZRF/hM2X"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="oD/nqS0l" Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfhigh.stl.internal (Postfix) with ESMTP id D34382540105; Tue, 10 Dec 2024 07:02:06 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-11.internal (MEProxy); Tue, 10 Dec 2024 07:02:06 -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=1733832126; x=1733918526; bh=nwaPGmVOuZKUpPKpKFaqliSlmVSJnrB/Ki7/Ot1STjg=; b= ZRF/hM2XtUgpuUoxPPyNoI2qChrGP1SBhOfCYCB3IV++dBrjVetGWxQBvhvxktZY QgG0K0GhlBjlVAN5Tam9utBQ8En2a1deT7eGultPCvaN9UfFw5FKWCrLhibejBDR aVugF5l5z0TWaotUaAWZnFM/DfJRV7IL8CsntN+UG5eThlmibnJfZA7n0ZW2HT+C +fDxkeAOiZI3fm027fbrk3qPp/yJKF2JfYpkzjhrehcNAWsvVucRnFMxT+yKGyUz HGgA2GqgIwBaLRu50U0BrmIMaqTnTtKIzVB2dfIAgZza4NUuiTNCX/rJFvf3OQ0N 0QthhoISr8q2sFxwdQ1Anw== 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=1733832126; x= 1733918526; bh=nwaPGmVOuZKUpPKpKFaqliSlmVSJnrB/Ki7/Ot1STjg=; b=o D/nqS0lrNhgzOqJjnZa/jtMKsgE10iHwZvpfvEO+jt+NQSWYCbe+Y8AdQhx9OVTD kLDDYaQsIqM61GE2HgBQaxfHt6hegQfukxAx39Zi5z0oUt/1oCe8uHHhQKeFZ7gW 64w+f4dDZ+7c9e/9cBjAoZlO0chUks9SUthupPnnVD87cFJozNL212hTLESxifH8 2uMi/90oujOfFOCUpk7k6iiOPoInWcn/KQnqB0TmPQ1jWXaz09bZ553la1l7yTsf GfJ6cMYtbDVteAjKKV0aasEX8L3YqU/9G0O9rItGGwcm0p5+KtYUQnLG0dBN+Glb ONzbJzaKQaNI4ekis19xQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrjeekgdefgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdpuffr tefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnth hsucdlqddutddtmdenucfjughrpefhfffugggtgffkfhgjvfevofesthejredtredtjeen ucfhrhhomheprfgrthhrihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimh eqnecuggftrfgrthhtvghrnhepffeuiedujedvkeehuedvkeefffeivdeuleetkeduheej teekgedvudfgtdfgieelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepphhssehpkhhsrdhimhdpnhgspghrtghpthhtohepfedpmhhouggvpehs mhhtphhouhhtpdhrtghpthhtohepkhgrrhhthhhikhdrudekkeesghhmrghilhdrtghomh dprhgtphhtthhopehgihhtsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtohep ohhsfigrlhgurdgsuhguuggvnhhhrghgvghnsehgmhigrdguvg X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 10 Dec 2024 07:02:05 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 3fe24240 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 10 Dec 2024 12:00:31 +0000 (UTC) From: Patrick Steinhardt Date: Tue, 10 Dec 2024 13:01:46 +0100 Subject: [PATCH v2 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: <20241210-pks-ci-section-fixes-v2-1-e087cfd174f4@pks.im> References: <20241210-pks-ci-section-fixes-v2-0-e087cfd174f4@pks.im> In-Reply-To: <20241210-pks-ci-section-fixes-v2-0-e087cfd174f4@pks.im> To: git@vger.kernel.org Cc: Oswald Buddenhagen , karthik nayak 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 Tue Dec 10 12:01:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13901358 Received: from fout-b2-smtp.messagingengine.com (fout-b2-smtp.messagingengine.com [202.12.124.145]) (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 A04AC1A00F8 for ; Tue, 10 Dec 2024 12:02:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.145 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733832130; cv=none; b=nTwofchn4pLZ7+Vfa8RgNmFmjayVX1YqDXNN7SqqmRdUpfZohVE2bZUUtRt5q43LU/do0dwmBYQ5Dy6mhMtF8nqjGD6ebc2Sr2gm5JpNm/dxT2TwM9eAm+L58i97gyuuKSvDFk7k4hODm2Kj+oYki3NR+hZ3WyjLDKwCUduxWsM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733832130; c=relaxed/simple; bh=mpMQV83AowuzqWSs+bB3//z0Eg67AeRiDNQlMRa8pNY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FMDuj/fA5Pw/3VPltr6w0xlQYrMUsUd2ZuvpQ5k9ql5GuEGzYCPZpSXnKmu4SEm1hMM/5iKp7ITGOxI597m8mifVHsd6V8SJV39UVuBCVJcWFfPpvMZGsJORBFo85ICq2KtaeEIT7c+ZlhYphhRyys8B6pPoPJ0vV7N+miGMrlA= 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=xbb3Fv60; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=cpCSZqSw; arc=none smtp.client-ip=202.12.124.145 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="xbb3Fv60"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="cpCSZqSw" Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfout.stl.internal (Postfix) with ESMTP id 5B4861140168; Tue, 10 Dec 2024 07:02:07 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-05.internal (MEProxy); Tue, 10 Dec 2024 07:02:07 -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=1733832127; x=1733918527; bh=0cQRARztA0W/Fi2HfSYPDPp4L4gvmTtbzVPsSSwCl1Q=; b= xbb3Fv604dSqm9hH3Qb/mB6UQusGisz2UIweQiMBD9T+bOllg/P/IfLqjl15bwsw BFue1AhmXYfr8zT2r0X1I6Cp/uHsQiaR0lVtV45yP/ERTZcujSPKj/EefsEpnVIq f3RFNtES9i1Wmdh9WTiuk7RfH5W6jhWfzrBHTDnPWqsLXI2N0glkEP8OXRInFhVX cdW5WKLH6UiG1xZQ2rHc0tXT4V6b/T/tQ7RK5c1eXzYstTDvO2HFkmJ1bz9jpbYA 56LQrbaET+p1vwVyjeNB1TUqIK7hT3xQW/twlbRHKspx9/nSc1FaS52Lym55RHfW 1yYXg76D5ttDp+TBvg8WaQ== 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=1733832127; x= 1733918527; bh=0cQRARztA0W/Fi2HfSYPDPp4L4gvmTtbzVPsSSwCl1Q=; b=c pCSZqSwnGcWn2rug1yJIXAIgd2Ei+djFnrPCNjTWppAsnMEQbaMtx0d3aKjNhLfn guLfeE7S1hhpbc3bnLGJYGTwBw3naq8WSBzskBOhY5+4thxN1skxkURWoD4mhVFI QcsjS5kiPLuT/OrrXSMRBCZOXBQPW+o7ZPjbUnrhlFPvGsId28Gah1/cISrR3dL4 VrYJcl/tEIP0eLC6JLVIyb5asQHcDT50bhwZJWVMuu8toQ9FhaaY6ztPvk0Gx54K F+ECwdHs1pcit7LKMyCUpNaslFcw1c9mEQsvvuR1kIC1cEEWrmFFm+giqcSywrdv yowfa5/jGZZy8RsSSXqSA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrjeekgdefgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdpuffr tefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnth hsucdlqddutddtmdenucfjughrpefhfffugggtgffkfhgjvfevofesthejredtredtjeen ucfhrhhomheprfgrthhrihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimh eqnecuggftrfgrthhtvghrnhepffeuiedujedvkeehuedvkeefffeivdeuleetkeduheej teekgedvudfgtdfgieelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepphhssehpkhhsrdhimhdpnhgspghrtghpthhtohepfedpmhhouggvpehs mhhtphhouhhtpdhrtghpthhtohepohhsfigrlhgurdgsuhguuggvnhhhrghgvghnsehgmh igrdguvgdprhgtphhtthhopehgihhtsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghp thhtohepkhgrrhhthhhikhdrudekkeesghhmrghilhdrtghomh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 10 Dec 2024 07:02:06 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 5f236dcf (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 10 Dec 2024 12:00:32 +0000 (UTC) From: Patrick Steinhardt Date: Tue, 10 Dec 2024 13:01:47 +0100 Subject: [PATCH v2 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: <20241210-pks-ci-section-fixes-v2-2-e087cfd174f4@pks.im> References: <20241210-pks-ci-section-fixes-v2-0-e087cfd174f4@pks.im> In-Reply-To: <20241210-pks-ci-section-fixes-v2-0-e087cfd174f4@pks.im> To: git@vger.kernel.org Cc: Oswald Buddenhagen , karthik nayak 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 Tue Dec 10 12:01:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13901359 Received: from fhigh-b3-smtp.messagingengine.com (fhigh-b3-smtp.messagingengine.com [202.12.124.154]) (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 AB0A81A0B12 for ; Tue, 10 Dec 2024 12:02:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.154 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733832131; cv=none; b=oZAuE0C+hifSKzVq8qyvOyTecUZmAYg1FxPjhLhgyQVPzCtHlNJ9D9bx1eOtIhViVvyGJB9LPCbMkxNwjQQ6YWbN8pQr1hZPaY3poDNXPzjlpYttH+mdyQcMkc54VYveiuwqEqyep6PeadvvO47ETULmNQgGjIMSwC+MWnm2K20= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733832131; c=relaxed/simple; bh=SpnoYTTc6Hlai9QoweaivZpQv1jX0wMwOkr+w7BQd9s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qSf3Zncn5OJyOGgYkHGEA3PbjCN3AEfitINZMdKiuJRPgVZVJ52wmqoHFyAraILoJjs/CmiqNAHiThzt1Oe1HSoaHZxJPGJmig6W7JA9T0VFWChbgmVQnIRncRkTAK2nNgwR95f/lFxFVxVgCF7yEnCce5qIwmq0KpJyiXem8I4= 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=OFlHUuRP; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=G2gSxSLC; arc=none smtp.client-ip=202.12.124.154 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="OFlHUuRP"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="G2gSxSLC" Received: from phl-compute-09.internal (phl-compute-09.phl.internal [10.202.2.49]) by mailfhigh.stl.internal (Postfix) with ESMTP id 5DB912540103; Tue, 10 Dec 2024 07:02:08 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-09.internal (MEProxy); Tue, 10 Dec 2024 07:02:08 -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=1733832128; x=1733918528; bh=4ZCJggiHDlitNgf7JrZPECm8kOigY2ndPal8rO1FE+4=; b= OFlHUuRP18/mDRkLzs39OVefGzZd2+++iFzFoxmOuvwnkA+zZMg270ebIkag0Ygz GrVh7FRKl31vMC4+qgoKrxi1aM2QARqSYdt/vpaeevYhJFzAE6kFIldF7MD2WEnh qtfeWDuEipGQyicLhj2YN5955/aetq/2pJI7Hbk3KnoaJNFALhb092HpMs2UKX9I mTtlJp/jh0FUVKza1bqwdf4gsquG9oLcWCuUIqTcMXSDnqgSvCuGBi25AF8KfHWu /cPMk5n8IG1sJrl/8kDwoTrqVAYj40HJv0tPaUNe8nbIrTIqh8is4XWV8aNohFjs 4RVWnRvgoYn+6bti/wxYpA== 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=1733832128; x= 1733918528; bh=4ZCJggiHDlitNgf7JrZPECm8kOigY2ndPal8rO1FE+4=; b=G 2gSxSLCvncmX26db3OopHF7lXOdCVaqhe0vqan4lHfE7mVT7rueG2gnsA3K+SkUc WRTVlBWDh/2iYPAglvLPYHz1GTl9rWvooJ2aqNdfimdxgpW4euzrzGczUvbctLt4 X6uWPiM8cqgZa0pu53xZtINvXKMFmzRrlxFXN1EBJCRigsHc2udF8VZigo4u8d+m AZ2hcU8XVlh1nrsPbyA3OOi6ZIx2ZFHzUyVvjGgmhCtM3Cg1Bs95LLmmfFV3GdPq b5F3JxFmpUUoQHrAxlycy046r+a+KhRnSa9O/Qp2uiENk8iXH16gdvXfvj379d2D lpczAk5zH3dJuRghXyJ5A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrjeekgdeffecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdpuffr tefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnth hsucdlqddutddtmdenucfjughrpefhfffugggtgffkfhgjvfevofesthejredtredtjeen ucfhrhhomheprfgrthhrihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimh eqnecuggftrfgrthhtvghrnhepffeuiedujedvkeehuedvkeefffeivdeuleetkeduheej teekgedvudfgtdfgieelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepphhssehpkhhsrdhimhdpnhgspghrtghpthhtohepfedpmhhouggvpehs mhhtphhouhhtpdhrtghpthhtohepohhsfigrlhgurdgsuhguuggvnhhhrghgvghnsehgmh igrdguvgdprhgtphhtthhopehkrghrthhhihhkrddukeeksehgmhgrihhlrdgtohhmpdhr tghpthhtohepghhithesvhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 10 Dec 2024 07:02:07 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 926e2d8c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 10 Dec 2024 12:00:33 +0000 (UTC) From: Patrick Steinhardt Date: Tue, 10 Dec 2024 13:01:48 +0100 Subject: [PATCH v2 3/4] ci/lib: do not interpret escape sequences in `group ()` arguments Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241210-pks-ci-section-fixes-v2-3-e087cfd174f4@pks.im> References: <20241210-pks-ci-section-fixes-v2-0-e087cfd174f4@pks.im> In-Reply-To: <20241210-pks-ci-section-fixes-v2-0-e087cfd174f4@pks.im> To: git@vger.kernel.org Cc: Oswald Buddenhagen , karthik nayak X-Mailer: b4 0.14.2 We use printf to set up sections with GitLab CI, which requires us to print a bunch of escape sequences via printf. The group name is controlled by the user and is expanded directly into the formatting string, which may cause problems in case the argument controls escape sequences or formatting directives. Fix this potential issue by using formatting directives to pass variable data. 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..f15f77f03a06120afbee438cee76ddc2683e1fa2 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" + printf '\e[0Ksection_start:%s:%s[collapsed=true]\r\e[0K%s\n' "$(date +%s)" "$(echo "$1" | tr ' ' _)" "$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" + printf '\e[0Ksection_end:%s:%s\r\e[0K\n' "$(date +%s)" "$(echo "$1" | tr ' ' _)" trap - EXIT } else From patchwork Tue Dec 10 12:01:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13901360 Received: from fhigh-b3-smtp.messagingengine.com (fhigh-b3-smtp.messagingengine.com [202.12.124.154]) (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 082E81A0BCA for ; Tue, 10 Dec 2024 12:02:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=202.12.124.154 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733832131; cv=none; b=LA0inoasc836YdGl98LHeWuvsbF461YlMLhWyTtfqK7rJaMXXdYRT9l5Stj+86RlW4Imifm3R1K8wilvxq15Z5bGQ4LnlQTxr3ke/YQOJ4AdF2OT17Nxuut/WCsPgmSzLisw2TU3lUBsW9ipfbY11mapN8LD3hJaT0E/dFdPKGU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733832131; c=relaxed/simple; bh=ph4Z6A+nJshjAG9peED2uEpsg6wWFkVjoGu6uXOSy1w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dLF+abQj8kvPkPVr/uMT5DICe2JwXIZFB5SnsstSL9AWx4w3DvSjzbR4kpHhdvJ2g4zYAVesH2IzCKnkLdra4pM20ytoTOUAgl2JZdqx+PO2OnWAe2LhbyKMUMDuCxJSMB68gUrUqAytyt9hr+7qpbJaZvBQw7jBst/i1oue3Vg= 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=ABAtdYfi; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=s6n0zu/j; arc=none smtp.client-ip=202.12.124.154 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="ABAtdYfi"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="s6n0zu/j" Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfhigh.stl.internal (Postfix) with ESMTP id E24D8254010F; Tue, 10 Dec 2024 07:02:08 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-06.internal (MEProxy); Tue, 10 Dec 2024 07:02:09 -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=1733832128; x=1733918528; bh=TdeJ8xL0yQkaqaL6oXvUcPOYxve8Xrwv4Ison0hYpDk=; b= ABAtdYfipKBIq1xGZRjZ1ukMdFZRiJdGkqDEoM4M0fg3wI623R/Z5sDguRqyKhmL OApMAfjpJLjbeiH+kmwHFtdS4nStv0f8zoIOXPnZeSh6LmSrDI/0lHkPtoQzPTjn mlC5d41XeJ4GG5i5s3zKlvnbiEiWrogdLe1jrV/PQ/Hlttl1EJU/HLnza3L8qanx Gt4SnQ0h4buIYdXZh1JAixntDM+GS5gx4iRz5FOx1XZBekEXppjg7T6qDdCk8HjK ewvDhX85F4OAkTByx6KKvAQwXv2LFmuvofKRwggG6Lq1IF/GCZfL2bimxQYB5K/c wK34Er7iCYU6SwKKK6V/HQ== 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=1733832128; x= 1733918528; bh=TdeJ8xL0yQkaqaL6oXvUcPOYxve8Xrwv4Ison0hYpDk=; b=s 6n0zu/jnURerK7CRBBsa0GiM/UMjgbDcKdfaJ6hwpwQmAY5j0MX6kzvWEWyU452T CfCCb82sBeCmBBmiKS9+joi3W/TVXF/9EHhSgaFr0iYCPSCXuMbXegHTFgfXGcTs g8sk3YNZ5XcI0eyUuRKrgHtjANDMBX/pMri9u2kyJXusy5vUUko9hrfJ/U57nn0L 8US7zvQEAz1wCVjNYq7Hbu3X7tSdJebDuWre+zypPIj6E0s30j/1oZ9vPmVeel8h 8Xqh+6hUKvonJHPDfVJidHPdlV/d9olUzUciknjXnRmXdSVsIdMXTVKX+HuWoOcW fyQRj4xKa3wRi5ItRje3Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrjeekgdefgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdpuffr tefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnth hsucdlqddutddtmdenucfjughrpefhfffugggtgffkfhgjvfevofesthejredtredtjeen ucfhrhhomheprfgrthhrihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimh eqnecuggftrfgrthhtvghrnhepffeuiedujedvkeehuedvkeefffeivdeuleetkeduheej teekgedvudfgtdfgieelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepphhssehpkhhsrdhimhdpnhgspghrtghpthhtohepfedpmhhouggvpehs mhhtphhouhhtpdhrtghpthhtohepkhgrrhhthhhikhdrudekkeesghhmrghilhdrtghomh dprhgtphhtthhopehoshifrghlugdrsghuugguvghnhhgrghgvnhesghhmgidruggvpdhr tghpthhtohepghhithesvhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 10 Dec 2024 07:02:07 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 9d8d33dd (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 10 Dec 2024 12:00:34 +0000 (UTC) From: Patrick Steinhardt Date: Tue, 10 Dec 2024 13:01:49 +0100 Subject: [PATCH v2 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: <20241210-pks-ci-section-fixes-v2-4-e087cfd174f4@pks.im> References: <20241210-pks-ci-section-fixes-v2-0-e087cfd174f4@pks.im> In-Reply-To: <20241210-pks-ci-section-fixes-v2-0-e087cfd174f4@pks.im> To: git@vger.kernel.org Cc: Oswald Buddenhagen , karthik nayak 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 f15f77f03a06120afbee438cee76ddc2683e1fa2..8ae8c0f77461d5bedc24e47be75711f2da2ade4f 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