From patchwork Thu Dec 12 06:47: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: 13904726 Received: from fout-a8-smtp.messagingengine.com (fout-a8-smtp.messagingengine.com [103.168.172.151]) (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 EEB893201 for ; Thu, 12 Dec 2024 06:47:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.151 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733986061; cv=none; b=Iq70OESox3aiwsjJEraqPmT23XRukrSL0tHsup2avxHeRgyDWV1LvFb0gGNRGXMfbvpCpguqf1ZBjL46QGsGttFi+wBaOsAwhWk4aLUioqCx6jrhuacGlvh3/LyEmuNARzNKYRKplexwkmW6Cu3vD4+TQrb9q20JDjsIApieVMQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733986061; c=relaxed/simple; bh=n0f1XCJp5sTGtpkm5VwIPJ9goKkSQQ+xmheNRz1SUJ4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MPiM0HDMWUYFMc5uIuPAO5m5KYonwMzQH0vYbflkSHm9QwbbpwGFU4hp3rulNoIMhafbdrkN2pZEyhyeCDXW7j6AisA4/X1r3nHz19Bdb8PIFYjIJIleTISRRwZTpuqI2x9ZW4mOFHJCOR97OE9yfN0aCdp/mhZYJ7ZgWpF+wWo= 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=oa75INqi; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=qEoWdlqs; arc=none smtp.client-ip=103.168.172.151 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="oa75INqi"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="qEoWdlqs" Received: from phl-compute-03.internal (phl-compute-03.phl.internal [10.202.2.43]) by mailfout.phl.internal (Postfix) with ESMTP id D4A20138221E; Thu, 12 Dec 2024 01:47:36 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-03.internal (MEProxy); Thu, 12 Dec 2024 01:47:36 -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=1733986056; x=1734072456; bh=nwaPGmVOuZKUpPKpKFaqliSlmVSJnrB/Ki7/Ot1STjg=; b= oa75INqiCb+wpbDuTwHEklt9OVQtZAbb6kh264p+2tFTBiUSloYjctnK/pww/dCn RtPiR958wSAoREy5SM9yIDMAw4aeXpGzw/zPiNs/tzXxaG/GDXLQl91DkPl/Z0hS Ae25dPGqSvQjlHVC9QU19JQMrIjQs1FC3ZWtupWBmIfTj7ipAmJCx2OOeUqFaFsf Tk/KlG2G75hSE9je+rKWx5j3MHOPtdYEiVZSc4/Zh0AcnBDwt2kKgWev4jTXzpL2 da28I7w9aN9BBwY6EzFKdoQtDgassaj/ntRXllPnEgf2LAEIvpcav7M/dqdsDxAO xxlI0uBlsQ+0bte9H8EKcQ== 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=1733986056; x= 1734072456; bh=nwaPGmVOuZKUpPKpKFaqliSlmVSJnrB/Ki7/Ot1STjg=; b=q EoWdlqsAUPvM0NzzyDCb7TY3XxIpssztKQiqeVnVz9ZaDmmysuO79J1rWufEgpSD vnmE5XPOMTbHnd0krIIFsEDSNvpEdLyzwSxMDg5aYYaZVJAalM719/Z3Uj/GGSsx PSuGRTPWtpjFDVzBFf8Snp4OIjQIjWVXuyu+M9nmZZpGE3Ws/rNlRCEJO79cULs0 Ym1XLmcb9W+hA2ViI+VMnsjUbcn23qRcptqvKG2ItbNrCurFIng7DfdqMfidbd3h azqBCPtPy0+iboE7qUfVxlPuX0o2J0KLMA9hcDeKD9QzCjdyVP/4aEwjsWcMpE0K nGYfvLUMuApDc6fIfECeQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrkeeggddvtdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdpuffr tefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnth hsucdlqddutddtmdenucfjughrpefhfffugggtgffkfhgjvfevofesthejredtredtjeen ucfhrhhomheprfgrthhrihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimh eqnecuggftrfgrthhtvghrnhepffeuiedujedvkeehuedvkeefffeivdeuleetkeduheej teekgedvudfgtdfgieelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepphhssehpkhhsrdhimhdpnhgspghrtghpthhtohepgedpmhhouggvpehs mhhtphhouhhtpdhrtghpthhtohepohhsfigrlhgurdgsuhguuggvnhhhrghgvghnsehgmh igrdguvgdprhgtphhtthhopehtohhonhesihhothgtlhdrtghomhdprhgtphhtthhopehg ihhtsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtohepkhgrrhhthhhikhdrud ekkeesghhmrghilhdrtghomh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 12 Dec 2024 01:47:35 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id ec0267d0 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 12 Dec 2024 06:45:55 +0000 (UTC) From: Patrick Steinhardt Date: Thu, 12 Dec 2024 07:47:14 +0100 Subject: [PATCH v3 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: <20241212-pks-ci-section-fixes-v3-1-d9fe6baee21e@pks.im> References: <20241212-pks-ci-section-fixes-v3-0-d9fe6baee21e@pks.im> In-Reply-To: <20241212-pks-ci-section-fixes-v3-0-d9fe6baee21e@pks.im> To: git@vger.kernel.org Cc: Oswald Buddenhagen , karthik nayak , Toon Claes 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 Thu Dec 12 06:47: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: 13904727 Received: from fhigh-a3-smtp.messagingengine.com (fhigh-a3-smtp.messagingengine.com [103.168.172.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 307CE174EF0 for ; Thu, 12 Dec 2024 06:47:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.154 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733986061; cv=none; b=qabj1ydShLWEN8L8pA39HlrV6wdQBnOn1CWoDZyQydPpyj4pXLTcY2jUUskwK/t7uCKtqJDoWS3ELc+zI7PNJ3dSAm2OuYWtK1KTvP4BGXoRtfoi1tKJxYYtINeUakVBqxOvxiiDYgjeYfGRqCxu9DrfaFQsF0OoKTfKcs9NL18= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733986061; c=relaxed/simple; bh=mpMQV83AowuzqWSs+bB3//z0Eg67AeRiDNQlMRa8pNY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GMLwflWuO1bZ2NnodLqCsJXSlmbG9y4T0YmVschaCYCycE59McHhPTM/fvy6CKRl/Jr+U7WTUPbbwE01A0yEBUlUOLXF1tXHcI8ukfDyxsB9rx5SZKokWDqQWELBYp+nBoZ8IJZbC+p2nbRWdnxmZ2qRhc74OIU81ODJxKAP44Y= 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=Skz6dMCp; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=NybrCqEP; arc=none smtp.client-ip=103.168.172.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="Skz6dMCp"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="NybrCqEP" Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfhigh.phl.internal (Postfix) with ESMTP id 2CCE71140198; Thu, 12 Dec 2024 01:47:38 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-12.internal (MEProxy); Thu, 12 Dec 2024 01:47:38 -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=1733986058; x=1734072458; bh=0cQRARztA0W/Fi2HfSYPDPp4L4gvmTtbzVPsSSwCl1Q=; b= Skz6dMCp/UKQbs3sMYMObwaA5HSAA1V0V29mmUkQ8ZYGkVGDEoO3bvLD7niyMZ+r nPM/5d8Xy5/mZBbhSPYdBnMOTZdYntkuTMv6KjLk0si4/bf9T/6p2lOfq/HVokz+ kC4rmeotA1UZ0Wr1pjb8Qyaq24uabep0yFXwYcO1huFKdOUSXWzRI8MajUaRJpwH qo0gUksE1jIqV9OMFLxVAAOWaUORO7TSdrr9/yI8OVhV2UeZvwtLCcEIuAWBpIL6 QYsAfspeLyteLGUVR+jKEc6rXo1VNXMdKBlzGKZ7LksuYTg3jgUxNCRuKgU0SUP1 JTz7/bJ26KVkIGnSmcGlHA== 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=1733986058; x= 1734072458; bh=0cQRARztA0W/Fi2HfSYPDPp4L4gvmTtbzVPsSSwCl1Q=; b=N ybrCqEP33aF4S1KN+tIhldsznVytQ9RxAsff9pP4/MMgic6domcJx6HiKkZS6lVV +v+77eNK9g8wpIQV2Thc6UjUcfOr/efJwp+cEdCi7ZQ4hRWeLb+34YBl2yrWlatL J0NxkjU31/Syztj6Si95n6kY264hGFAKET7kSOxxDZivE717rsSn+cO9Z6Z4w6MM goAIJxL5YZhshFrRZMn8ln6lpyEXuxF0cynwMn5358Fu/JQjJu7V2vKEM79X+8+p Ac/BjK1tku90Grds69oS4EgBfoM69LVrteTfUTnWcY4nNpaGXGCZZDTjSV/84db7 r/jj30xrvbIfhrSzJJB+Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrkeeggddvtdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdpuffr tefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnth hsucdlqddutddtmdenucfjughrpefhfffugggtgffkfhgjvfevofesthejredtredtjeen ucfhrhhomheprfgrthhrihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimh eqnecuggftrfgrthhtvghrnhepffeuiedujedvkeehuedvkeefffeivdeuleetkeduheej teekgedvudfgtdfgieelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepphhssehpkhhsrdhimhdpnhgspghrtghpthhtohepgedpmhhouggvpehs mhhtphhouhhtpdhrtghpthhtohepohhsfigrlhgurdgsuhguuggvnhhhrghgvghnsehgmh igrdguvgdprhgtphhtthhopehtohhonhesihhothgtlhdrtghomhdprhgtphhtthhopehg ihhtsehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtohepkhgrrhhthhhikhdrud ekkeesghhmrghilhdrtghomh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 12 Dec 2024 01:47:36 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 76d532b2 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 12 Dec 2024 06:45:56 +0000 (UTC) From: Patrick Steinhardt Date: Thu, 12 Dec 2024 07:47:15 +0100 Subject: [PATCH v3 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: <20241212-pks-ci-section-fixes-v3-2-d9fe6baee21e@pks.im> References: <20241212-pks-ci-section-fixes-v3-0-d9fe6baee21e@pks.im> In-Reply-To: <20241212-pks-ci-section-fixes-v3-0-d9fe6baee21e@pks.im> To: git@vger.kernel.org Cc: Oswald Buddenhagen , karthik nayak , Toon Claes 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 Thu Dec 12 06:47: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: 13904729 Received: from fout-a8-smtp.messagingengine.com (fout-a8-smtp.messagingengine.com [103.168.172.151]) (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 615F91862BB for ; Thu, 12 Dec 2024 06:47:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.151 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733986061; cv=none; b=FXARNd0Oj+Le+bd4I7DcldzPnQw0BimbfAOFK3gyi9BQtIbe3yvhOe3mgPbJ+E60OOJx8Hu4Hf1iqYgCscqK/pewUNICYgj+f+80K+xecGRwrkc2zAyKwlIkzY1KP1yRZ2pUtSHKeScl3QEsdP+J3A9ZwROXdi7y7D3itaaifuU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733986061; c=relaxed/simple; bh=6u3jNIEou4E7E8+mlNXJvRTj7OuT7PNb9E7b14MmqMs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CXxmTgTJb3LQmSURGBDIkLIILRFd70bhqKdnYOWY5qn0h0fgn47GT3ZQKeOvN1qA0y+HLba1yweksFywjDTPV2gHl/QUNcIri4S/oO0wiFLX0blzjkhWjVaCJ8UXAsdLAqKDhQDXEhwKQjX90nPnB6/14eG+wphp3FrU1jab0Ac= 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=ZO++WCry; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=FlUhfGMj; arc=none smtp.client-ip=103.168.172.151 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="ZO++WCry"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="FlUhfGMj" Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfout.phl.internal (Postfix) with ESMTP id 1C7DD1383F78; Thu, 12 Dec 2024 01:47:38 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-11.internal (MEProxy); Thu, 12 Dec 2024 01:47:38 -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=1733986058; x=1734072458; bh=ttMliZIlbe1cViJbN6Y2nApJ/42o8hTTGc7BcrOhtjI=; b= ZO++WCrytbnHc1Fib73tCGS8QU71Cg6qZT24PmjMJJI0GDM27JI2dMycA2+9Nwdo 7tyYIr7VPuK+7+oua0W0dd45ZlWdBK/mdXed0bxtMGYyJ0cFiJhr8CZI5qjol9WC Zp9ESJqqzi5+ENTFFOCj7W7bsu5cDk0h8aLMuSOkCbmS3fuQwWR2IGYg8rn0rnpS SwSS9pn67y2GyE21E2lPN5x0jmebfMspaZmhTQwgX84JJqg6niOCXKntxyRgtkYH Ca30DaaIhaOp6GydWLs6s/MNwc2eDly38rLquCW2H1FBrjxUM7kthPMv0Nfg1joo A4XGV+hM4tYyIMp3rD6xag== 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=1733986058; x= 1734072458; bh=ttMliZIlbe1cViJbN6Y2nApJ/42o8hTTGc7BcrOhtjI=; b=F lUhfGMjU+5uMaWvS24XqiUaZI6jp2hEMvW3rvauFYV1t9g5PLQUZDiFckfT2CREy LkltKbGEqwDgrDA4eL3GusiZuMLzLjrhEybLu1DI5EJG4SqLQxQUZNzS4zDE1nZ3 i6Ss6CC/tHOdFnaMCDglukhsQS9NY/F0bhDhDT2fjWK+0aXXXsxd24QQyw5e3zGm qv0Lx61j97no3Mxy03icLUOC4WceJANGrmUNYUaD50fAVn4TKCuZi17P5QIb8DrZ Rt4DU5L0TLVRoAjWfKqIeBmLFQbiaI/hv0YH+Q7RcRsI95ZXQt4tUkqyqvHxycpw G5J40wsb+Z/5FtFqbex8w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrkeeggddvtdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdpuffr tefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnth hsucdlqddutddtmdenucfjughrpefhfffugggtgffkfhgjvfevofesthejredtredtjeen ucfhrhhomheprfgrthhrihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimh eqnecuggftrfgrthhtvghrnhepffeuiedujedvkeehuedvkeefffeivdeuleetkeduheej teekgedvudfgtdfgieelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepphhssehpkhhsrdhimhdpnhgspghrtghpthhtohepgedpmhhouggvpehs mhhtphhouhhtpdhrtghpthhtohepthhoohhnsehiohhttghlrdgtohhmpdhrtghpthhtoh epkhgrrhhthhhikhdrudekkeesghhmrghilhdrtghomhdprhgtphhtthhopehgihhtsehv ghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtohepohhsfigrlhgurdgsuhguuggvnh hhrghgvghnsehgmhigrdguvg X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 12 Dec 2024 01:47:37 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 1addd625 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 12 Dec 2024 06:45:57 +0000 (UTC) From: Patrick Steinhardt Date: Thu, 12 Dec 2024 07:47:16 +0100 Subject: [PATCH v3 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: <20241212-pks-ci-section-fixes-v3-3-d9fe6baee21e@pks.im> References: <20241212-pks-ci-section-fixes-v3-0-d9fe6baee21e@pks.im> In-Reply-To: <20241212-pks-ci-section-fixes-v3-0-d9fe6baee21e@pks.im> To: git@vger.kernel.org Cc: Oswald Buddenhagen , karthik nayak , Toon Claes 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 contains 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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/lib.sh b/ci/lib.sh index a54601be923bf475ba1a9cafd98bb1cb71a10255..d403ada911722af554df6255e5cd3fa01b56fd22 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -18,7 +18,8 @@ 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 +28,8 @@ 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 Thu Dec 12 06:47:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13904730 Received: from fhigh-a3-smtp.messagingengine.com (fhigh-a3-smtp.messagingengine.com [103.168.172.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 30822181B8F for ; Thu, 12 Dec 2024 06:47:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.154 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733986062; cv=none; b=MuUUMlMDZvpzQfscgAIzWu5nTYd2HqrWa0IwKcmFxE9t7lpAHYwbabzy9AzpOUuW6rwFxsGakh8exXAAem45hQinlPcvbaq/2ItbEl2JY+M40jEIaYNrwZoZL/6JRgFN1HnS46CTlpsDOtNglXUPfCrrskCUMVqJHXxEbUnyjEk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733986062; c=relaxed/simple; bh=iepnD6c0NlBrD/LuEoP8J3lXrzLO/j2QBhCmOwHhtVU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aEhIZ534IkvI4N7AbTCX2xH2kSbFCwD1lSEIgkd+HTUscoCqvNzEW8Pe9VIL78P6N2c7NXjDo1FdTGJyfLV5murE0tmnWbu5T4pAe6QZmMphd9aW3fIT4fJqO0c9p3zSPMkMG/k1A0rH0GOx0cJQ65rQTzDLasfSS/ZfbNPIVW0= 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=e4ybURAk; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=LhNxif4j; arc=none smtp.client-ip=103.168.172.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="e4ybURAk"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="LhNxif4j" Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfhigh.phl.internal (Postfix) with ESMTP id 26F641140173; Thu, 12 Dec 2024 01:47:38 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-12.internal (MEProxy); Thu, 12 Dec 2024 01:47:38 -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=1733986058; x=1734072458; bh=uabs0UdoJGVls4d5+ll2f3Cb972T+SboaXhMfUQ0MzE=; b= e4ybURAkcJwZhkhHFz7dy+NiMpmFZEqQ96w7vpYggRk0/vmK+APXx6HRlEc+28Ro fb7X6vMhoi23JsjuRB1O3I3ZQinc2asRsFVC6gzVaeBZpC4pOSjytvkDGfRfDQvU W9MW3hXGXlV9ZiSOhqV5qGxtk2bNLZ0FYNLIc1H10eHCc8jXpyrJCqzbyxdXsSw5 Bmtxf1iONIRsY+WHgQyelghpddRTWKBOux292MMCtR8lAc2oXkr+ltCI+2ZhNUCn aTOXfjY7ocukM9A9XsGCVwhtIFBzdipoPoFBM90KbkjOD4O0Yj7ohcpWacQ496tq lrf2ekzA5PBRAH1uPTYPsQ== 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=1733986058; x= 1734072458; bh=uabs0UdoJGVls4d5+ll2f3Cb972T+SboaXhMfUQ0MzE=; b=L hNxif4j5XvXra5QGW+AGhJX6IvyibtY4YSMnuUtlL+wosh+vuQyVLGkfR7SMrWcm M3ZLPbWwAQrNeV3nEQPXF0Bu56dE73lYn6xV/ltydQuKA9jF45bJ3WFkMAAsJYaI NkTXzClqpofS/0IHjh1D5TNzB2y+evkmfi2TaJGFFMhMUHZ2ts6dJkp6+ej4a91L S0e7sqcE1KLI4ujKYuTfg1kUeDdCRp39ZiCPj2ueOcqPwNOoaSvefkEbTBPGWJL0 vTeyFyVT+9w6RgTJ6am6YVYFmwjOF2+iqLq8oJPKQGbnYGTiKwjxm5+PSGxRf6Vb Gi+lJ1jYXBd1VGaX+qOUg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrkeeggddvtdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdpuffr tefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnth hsucdlqddutddtmdenucfjughrpefhfffugggtgffkfhgjvfevofesthejredtredtjeen ucfhrhhomheprfgrthhrihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimh eqnecuggftrfgrthhtvghrnhepffeuiedujedvkeehuedvkeefffeivdeuleetkeduheej teekgedvudfgtdfgieelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepphhssehpkhhsrdhimhdpnhgspghrtghpthhtohepgedpmhhouggvpehs mhhtphhouhhtpdhrtghpthhtohepthhoohhnsehiohhttghlrdgtohhmpdhrtghpthhtoh epkhgrrhhthhhikhdrudekkeesghhmrghilhdrtghomhdprhgtphhtthhopehgihhtsehv ghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtohepohhsfigrlhgurdgsuhguuggvnh hhrghgvghnsehgmhigrdguvg X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 12 Dec 2024 01:47:37 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id a5691f2d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 12 Dec 2024 06:45:58 +0000 (UTC) From: Patrick Steinhardt Date: Thu, 12 Dec 2024 07:47:17 +0100 Subject: [PATCH v3 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: <20241212-pks-ci-section-fixes-v3-4-d9fe6baee21e@pks.im> References: <20241212-pks-ci-section-fixes-v3-0-d9fe6baee21e@pks.im> In-Reply-To: <20241212-pks-ci-section-fixes-v3-0-d9fe6baee21e@pks.im> To: git@vger.kernel.org Cc: Oswald Buddenhagen , karthik nayak , Toon Claes 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 d403ada911722af554df6255e5cd3fa01b56fd22..5440eb6dc02784c03a5e4919f97dd7f07881f5c7 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -57,7 +57,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. @@ -395,5 +395,5 @@ esac MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}" -end_group "CI setup" +end_group "CI setup via $(basename $0)" set -x