From patchwork Fri Jan 3 14:46:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13925626 Received: from fout-a3-smtp.messagingengine.com (fout-a3-smtp.messagingengine.com [103.168.172.146]) (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 2CFEA1FA8E2 for ; Fri, 3 Jan 2025 14:47:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.146 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735915630; cv=none; b=f71gLt7Bc5LlypZhhqHXayKy1pZYvVHkar7OLEv7s8It6fNotyMf7WQdhS6dPBEq6c7N9FXHBDzCjE17o+jQ2S0w7Ypp414SJNdR99zplt1OSbz+5sjKMdwkXLEfzVj7nECUvSU0B8Ucepwgaqq/F1jTH3PGy3PHCmFiScK+Kb8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735915630; c=relaxed/simple; bh=hUUjoJVHhnbKX6Dve6xUtGl6aG8rwJz0j7IkToXzRYU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CjmIyP7NDz50Kn4d/LAZp/k2cf9spNfNV0V2YyGb18PSvwRYopgne1hg+fmvqABBDauAAXAznCgpuWuEE443jZbwf+TXfcxNj/DnxyWKwWMEAQuNaCjj7//hQ3Wo/eKia+25WFrmIzckl9w7thlcfXfToyAHtsCbuL9aZnU9ifo= 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=lh/qyH+d; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=HQCfbOA3; arc=none smtp.client-ip=103.168.172.146 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="lh/qyH+d"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="HQCfbOA3" Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfout.phl.internal (Postfix) with ESMTP id 26B121380683 for ; Fri, 3 Jan 2025 09:47:07 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-06.internal (MEProxy); Fri, 03 Jan 2025 09:47: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=fm2; t=1735915627; x=1736002027; bh=GpnJSDHbCxx99UXaUbgN7iQj9dVJKT/I/QBjOvZZS80=; b= lh/qyH+dQRuPbIDZnEx/UtsAoA9lKHNhhXU88ltoKXONciBhpYdPW3Ji8HCe/2GS VkfdK1szD5xpsjTYYWDbwZrtGSQ+/GLq8lALWmfBfzhOdINrfWleouZPLMs9/k3F GBq1UJqgYltmVTlFGM117nqeu5FrNWrgzl5lErqmaxta3iVD4FYSfcfHPgg9Nq4u 3T6U8xXD3ZRJHJYMvBdgUQLFCMw8NErvHIpvrOzErV8JTsnaE+JGMHddK1URJ1wT 9ZrplxcX8OTTWXtCx/DRTmh7z0iHzLlqlpnpkCqEPuoM1HH7yhn/hZXBoJKePo33 1NaBdAofOTQBoGLv1+VtHw== 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=fm2; t=1735915627; x= 1736002027; bh=GpnJSDHbCxx99UXaUbgN7iQj9dVJKT/I/QBjOvZZS80=; b=H QCfbOA303tbhCrt2BoMUsEMMVBftjos7jlpM5JOUM4i6ma63y+a8fjUiYY8FLNuj R6TUeFNX7zh7dp11bxL0Jnw2ZOt8xsTORIARq3I3Js/bAqASY1BvsWRPbG+1ZaY1 4t49VizI1403JsaJHN5hJSuHJ8cWY2lIP0PuqtBfQSnYpbB2RR83ax+IIpzutRQh OOjA5xdGziF0EKi9HAvAcD+LXQgXtOFbg6YJ69Fkw43K9Hqtg7OpEPL+GIxiBP+G jzYgRI9hqFr7rOiN6/CGCAjvf2iksu5oy2z/JfiplfxR9ekPNuIXG1P4kEHmabCj gUvC1IOHrvy4a1nXwDtXA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudefgedgieekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhfffugg gtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufhtvghi nhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepffeuieduje dvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimhdpnh gspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhithes vhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 3 Jan 2025 09:47:06 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id a9eb20d9 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 3 Jan 2025 14:47:03 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 03 Jan 2025 15:46:38 +0100 Subject: [PATCH 01/10] t0060: fix EBUSY in MinGW when setting up runtime prefix Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250103-b4-pks-ci-fixes-v1-1-a9bb95dff833@pks.im> References: <20250103-b4-pks-ci-fixes-v1-0-a9bb95dff833@pks.im> In-Reply-To: <20250103-b4-pks-ci-fixes-v1-0-a9bb95dff833@pks.im> To: git@vger.kernel.org Cc: X-Mailer: b4 0.14.2 Two of our tests in t0060 verify that the runtime prefix functionality works as expected by creating a separate directory hierarchy, copying the Git executable in there and then creating scripts relative to that executable. These tests fail quite regularly in GitLab CI with the following error: expecting success of 0060.218 '%(prefix)/ works': mkdir -p pretend/bin && cp "$GIT_EXEC_PATH"/git$X pretend/bin/ && git config yes.path "%(prefix)/yes" && GIT_EXEC_PATH= ./pretend/bin/git config --path yes.path >actual && echo "$(pwd)/pretend/yes" >expect && test_cmp expect actual ++ mkdir -p pretend/bin ++ cp /c/GitLab-Runner/builds/gitlab-org/git/git.exe pretend/bin/ cp: cannot create regular file 'pretend/bin/git.exe': Device or resource busy error: last command exited with $?=1 not ok 218 - %(prefix)/ works Seemingly, the "git.exe" binary we are trying to overwrite is still being held open. It is somewhat puzzling why exactly that is: while the preceding test _does_ write to and execute the same path, it should have exited and shouldn't keep any backgrounded processes around. So it must be held open by something else, either in MinGW or in Windows itself. While the root cause is puzzling, the workaround is trivial enough: instead of writing the file twice we simply pull the common setup into a separate test case so that we won't observe EBUSY in the first place. Signed-off-by: Patrick Steinhardt --- t/t0060-path-utils.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh index dbb2e73bcd912ae6a804603ff54e4c609966fa5d..8545cdfab559b4e247cb2699965e637529fd930a 100755 --- a/t/t0060-path-utils.sh +++ b/t/t0060-path-utils.sh @@ -592,17 +592,19 @@ test_lazy_prereq CAN_EXEC_IN_PWD ' ./git rev-parse ' +test_expect_success !VALGRIND,RUNTIME_PREFIX,CAN_EXEC_IN_PWD 'setup runtime prefix' ' + mkdir -p pretend/bin && + cp "$GIT_EXEC_PATH"/git$X pretend/bin/ +' + test_expect_success !VALGRIND,RUNTIME_PREFIX,CAN_EXEC_IN_PWD 'RUNTIME_PREFIX works' ' - mkdir -p pretend/bin pretend/libexec/git-core && + mkdir -p pretend/libexec/git-core && echo "echo HERE" | write_script pretend/libexec/git-core/git-here && - cp "$GIT_EXEC_PATH"/git$X pretend/bin/ && GIT_EXEC_PATH= ./pretend/bin/git here >actual && echo HERE >expect && test_cmp expect actual' test_expect_success !VALGRIND,RUNTIME_PREFIX,CAN_EXEC_IN_PWD '%(prefix)/ works' ' - mkdir -p pretend/bin && - cp "$GIT_EXEC_PATH"/git$X pretend/bin/ && git config yes.path "%(prefix)/yes" && GIT_EXEC_PATH= ./pretend/bin/git config --path yes.path >actual && echo "$(pwd)/pretend/yes" >expect && From patchwork Fri Jan 3 14:46:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13925627 Received: from fout-a3-smtp.messagingengine.com (fout-a3-smtp.messagingengine.com [103.168.172.146]) (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 3050D1FA82F for ; Fri, 3 Jan 2025 14:47:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.146 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735915631; cv=none; b=MEuJIEj1Jfs7LRNTkQyOekkD1ncHeD2QoqU21f4/zSU9n/6WXqupfJ/fetg2dSiCckHLO4B1+8yVcPtc+l2gtBNPn5Gps1cKMunmaxeKNKKO5onCbr9eIM77uCC6gILNsWF8AhhDPUDk95N/5UMizLMjfez+PqsIkThCONowFtk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735915631; c=relaxed/simple; bh=HMH0fpUN1uI7/2bWhxXkqOcvNXEH6e4k46mtsF6SdSQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IGvLX6xulZZ8X+YdMAqAQA9EZ0TybzoVUKiyXIjqYlMLQfBvW6GHT72uWVZpuHwpLOuhAj9ixT5qzTDRWx+XMIjoaUkKtW2N52MtswWH0+Pnts9yjUUnkTf98yYij8AmGtYBR2wDGFYPF+AlCQJXp3YY4Nr8CAr7PznIrv25+po= 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=uw5QUDR8; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=ORbCZFwo; arc=none smtp.client-ip=103.168.172.146 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="uw5QUDR8"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="ORbCZFwo" Received: from phl-compute-03.internal (phl-compute-03.phl.internal [10.202.2.43]) by mailfout.phl.internal (Postfix) with ESMTP id 1A4B313806DA for ; Fri, 3 Jan 2025 09:47:08 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-03.internal (MEProxy); Fri, 03 Jan 2025 09:47: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=fm2; t=1735915628; x=1736002028; bh=oML5C9rooFVckFk2VilofDdmvx3UowN2qmRzsP2cyEA=; b= uw5QUDR8n9aTcuUw5rH2iZiZqXGZsBYn1DcAk4a8RTaRlDTR65b+lEVnSlgzU9EF tN7QYq90Dm35f8xVZ1l6z1IQl+ESWjMZ7ueuoXkfbnyG29WEFZByr7ENigix4t4c tTyBusn1tDXF7cV07KAeli7EK9N9MHCMP+PxpeceOiNi0o5+mUdDmeLLI7TXy6by JaDrjHvtwDHncA36Oyx6Vlzdp5azcVj+EzSPcNLFLEywTz1Ts1Ee2o4WxXHdTcLo UiMCC/PFJg38Eom/m2MuY4tG6Rs9LXau6n5iGhd759tzz4uzMnbue83rh+HborhQ mMx6XUzh4fDgSF8PungeAg== 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=fm2; t=1735915628; x= 1736002028; bh=oML5C9rooFVckFk2VilofDdmvx3UowN2qmRzsP2cyEA=; b=O RbCZFwouXJzjJgsVj2LKNbq8AS977yw/MMZr0RNG7ebAdH0tkrAlwvSG9zTGmGyN HwwNFUQk+5btLW0dL1x8bC2eb4U9Nnkqb+fsKt0p8v5Nj6KutGs2x5o5zeyr6jgn SULX7zZQ3Q2j28RCcQNyOnkwM+hTVfr4m9B51r/VOa8yZere75MONZ8lz1FM5mx0 6yI3PnUwLw5qgui699+CukKhZlR7C6R8vtAR3qiLAuvene8hd0NLOsU+axhUpRQl Q+koduaeprq7V/7k5hgrsIdKP5P6DMoyVXvPfnhgl+sCsAfJgieRngv2j3LWaY/F LmEa3uAXrDh5Bkkp5Si3w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudefgedgieekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhfffugg gtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufhtvghi nhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepffeuieduje dvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimhdpnh gspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhithes vhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 3 Jan 2025 09:47:07 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 4bef1e97 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 3 Jan 2025 14:47:04 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 03 Jan 2025 15:46:39 +0100 Subject: [PATCH 02/10] t7422: fix flaky test caused by buffered stdout Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250103-b4-pks-ci-fixes-v1-2-a9bb95dff833@pks.im> References: <20250103-b4-pks-ci-fixes-v1-0-a9bb95dff833@pks.im> In-Reply-To: <20250103-b4-pks-ci-fixes-v1-0-a9bb95dff833@pks.im> To: git@vger.kernel.org Cc: X-Mailer: b4 0.14.2 One test in t7422 asserts that `git submodule status --recursive` properly handles SIGPIPE. This test is flaky though and may sometimes not see a SIGPIPE at all: expecting success of 7422.18 'git submodule status --recursive propagates SIGPIPE': { git submodule status --recursive 2>err; echo $?>status; } | grep -q X/S && test_must_be_empty err && test_match_signal 13 "$(cat status)" ++ git submodule status --recursive ++ grep -q X/S ++ echo 0 ++ test_must_be_empty err ++ test 1 -ne 1 ++ test_path_is_file err ++ test 1 -ne 1 ++ test -f err ++ test -s err +++ cat status ++ test_match_signal 13 0 ++ test 0 = 141 ++ test 0 = 269 ++ return 1 error: last command exited with $?=1 not ok 18 - git submodule status --recursive propagates SIGPIPE The issue is caused by us using grep(1) to terminate the pipe on the first matching line in the recursing git-submodule(1) process. Standard streams are typically buffered though, so this condition is racy and may cause us to terminate the pipe after git-submodule(1) has already exited, and in that case we wouldn't see the expected signal. Fix the issue by converting standard streams to be unbuffered. I have only been able to reproduce this issue a single time after running t7422 with `--stress` after an extended amount of time, so I cannot claim to be fully certain that this fix is sufficient. Signed-off-by: Patrick Steinhardt --- t/t7422-submodule-output.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/t/t7422-submodule-output.sh b/t/t7422-submodule-output.sh index f21e9203678b94701281d5339ae8bfe53d5de0ed..ba843c02c9c2da198578aec5716813de32960b86 100755 --- a/t/t7422-submodule-output.sh +++ b/t/t7422-submodule-output.sh @@ -166,9 +166,13 @@ do ' done -test_expect_success !MINGW 'git submodule status --recursive propagates SIGPIPE' ' - { git submodule status --recursive 2>err; echo $?>status; } | - grep -q X/S && +test_lazy_prereq STDBUF ' + stdbuf --version +' + +test_expect_success !MINGW,STDBUF 'git submodule status --recursive propagates SIGPIPE' ' + { stdbuf -oL git submodule status --recursive 2>err; echo $?>status; } | + stdbuf -i0 grep -q X/S && test_must_be_empty err && test_match_signal 13 "$(cat status)" ' From patchwork Fri Jan 3 14:46:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13925628 Received: from fhigh-a7-smtp.messagingengine.com (fhigh-a7-smtp.messagingengine.com [103.168.172.158]) (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 34AB81FA8DB for ; Fri, 3 Jan 2025 14:47:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.158 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735915631; cv=none; b=Nar+5C2aqNChPxbgGwPvwKLPgY3J4lG+VJ6iPJ+5zLFNGprRY5VaLIh/MlBhaz6ioIUSQh/BRFUj2x8oE6cWxpXpLjD8dLfBczedwMQDIs/jtjEYEvcZPbO4ukCw0Z76QIYis1O4JaPhMPwP6uV6PbO2JCsKgpDvZwQYguKt5m8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735915631; c=relaxed/simple; bh=ghuyw6SYeYHbpzHzibb/6G6Xb9vwckZ6TOFdumvisKo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ohS+S6dNRdcvZMf/gyWSrt7U5CTzXFWtj56C79PeJX42UpH/9XuJjP3IMhzL8XQx8IHVVtYAzc/6UwtbGbwZWO36yTS2bmJHry68vye7RolKJesgViRa1AmmY6U9xfEXUGvcntWqAena6noJDDtvXbu4FvoZ2PDHcsfgGU+A4SM= 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=OWLUYbWF; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=hS/qSyA+; arc=none smtp.client-ip=103.168.172.158 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="OWLUYbWF"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="hS/qSyA+" Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfhigh.phl.internal (Postfix) with ESMTP id 499071140161 for ; Fri, 3 Jan 2025 09:47:08 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Fri, 03 Jan 2025 09:47: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=fm2; t=1735915628; x=1736002028; bh=M1utMMxCkHLW5BeP2wWQdzyI/KTXFh+zs1jcqmqGxCk=; b= OWLUYbWF+U7O04cZL9MNYOAB4znBSIx6Dc+Z7Ju0AZPBgrF3FiDY2RvryG7mpkeD IviXHBVAFSKOCZkg1IAEGJyYBDR6iGicV2407ynoSteQ123Inbnhpc5diow/KPJY Sdy14kzku9dUGyv6Ak4wwGHnKoIyy2+L/kxAUUN2lZOKkZGz/zdhz7aLtGWd1e9/ tsN8n0MBD6ZJy45vuNg/BNTlmGe3VU+NCEg0mS3pWLkzHMbrhZoNXH8yhFkSF76A Ve/Tx6t4EN+9Tp7AtPsLa4t3ivQDhpFqJiSiB/Du7D4Oaq8ZKSPcE8nUfb5tfi7Q VTLVi7M9A33Kf1GWdBPWwg== 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=fm2; t=1735915628; x= 1736002028; bh=M1utMMxCkHLW5BeP2wWQdzyI/KTXFh+zs1jcqmqGxCk=; b=h S/qSyA+1OY9lKP2RtVKGgLBTFn2kQaqh79Bng1MgThd/VAKeRBUw9OQZdsbeqJmg pzDAEt6D8sVAISaeUfhyC7A6/umqOHXT8kzHWvAykPxlnBW7wYeP0dQi1E4OVCUk jEo2wc3UZaVb6IYwmEteXTaFQZB6pDV9HR7lA+7pCjLFDwivLZpF2P3FlrHtp8tH bOf8Kp/h+NXtmJwp8hDm7ZoFOGKdT7V+C4Q153cuMa+yg5lSLdFzOqmdU1+KKLF0 uLIjBba8Tc/TdTN65KWK9+AgXD708ENJ34y4FgX97QW6K90cwsiTvBnoBO1OnHm7 5x0m9+wAlYBH5N9rYAp6g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudefgedgieekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhfffugg gtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufhtvghi nhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepffeuieduje dvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimhdpnh gspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhithes vhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 3 Jan 2025 09:47:07 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id f7761f64 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 3 Jan 2025 14:47:05 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 03 Jan 2025 15:46:40 +0100 Subject: [PATCH 03/10] github: adapt containerized jobs to be rootless Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250103-b4-pks-ci-fixes-v1-3-a9bb95dff833@pks.im> References: <20250103-b4-pks-ci-fixes-v1-0-a9bb95dff833@pks.im> In-Reply-To: <20250103-b4-pks-ci-fixes-v1-0-a9bb95dff833@pks.im> To: git@vger.kernel.org Cc: X-Mailer: b4 0.14.2 The containerized jobs in GitHub Actions run as root, giving them special permissions to for example delete files even when the user shouldn't be able to due to file permissions. This limitation keeps us from using containerized jobs for most of our Ubuntu-based jobs as it causes a number of tests to fail. Adapt the jobs to create a separate user that executes the test suite. This follows similar infrastructure that we already have in GitLab CI. Signed-off-by: Patrick Steinhardt --- .github/workflows/main.yml | 6 ++++-- ci/install-dependencies.sh | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 900be9957a23fcaa64e1aefd0c8638c5f84b7997..b02f5873a540b458d38e7951b4ee3d5ca598ae23 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -371,10 +371,12 @@ jobs: run: apt -q update && apt -q -y install libc6-amd64 lib64stdc++6 - uses: actions/checkout@v4 - run: ci/install-dependencies.sh - - run: ci/run-build-and-tests.sh + - run: useradd builder --create-home + - run: chown -R builder . + - run: sudo --preserve-env --set-home --user=builder ci/run-build-and-tests.sh - name: print test failures if: failure() && env.FAILED_TEST_ARTIFACTS != '' - run: ci/print-test-failures.sh + run: sudo --preserve-env --set-home --user=builder ci/print-test-failures.sh - name: Upload failed tests' directories if: failure() && env.FAILED_TEST_ARTIFACTS != '' uses: actions/upload-artifact@v4 diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index d1cb9fa8785388b3674fcea4dd682abc0725c968..ecb5b9d36c20d3e7e96148ac628a96c62642c308 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -31,7 +31,7 @@ alpine-*) ;; fedora-*|almalinux-*) dnf -yq update >/dev/null && - dnf -yq install make gcc findutils diffutils perl python3 gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel >/dev/null + dnf -yq install shadow-utils sudo make gcc findutils diffutils perl python3 gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel >/dev/null ;; ubuntu-*|ubuntu32-*|debian-*) # Required so that apt doesn't wait for user input on certain packages. From patchwork Fri Jan 3 14:46:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13925631 Received: from fout-a3-smtp.messagingengine.com (fout-a3-smtp.messagingengine.com [103.168.172.146]) (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 B4A5D1FAC25 for ; Fri, 3 Jan 2025 14:47:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.146 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735915631; cv=none; b=J6DJk94CmNHwWq2i6AzpZFgRPL6YtXGaYPB0twUV5TJkxR9SGXX68B1OSS29cgDuvlGSpR8HGFUpz1RdMlmB0baNoGPsuSHq4zaaCkPOp1Z4Atn4Km/lUh2BNxctjAvNJYblmBzJtaRBcX0osImG9hmfyNaz2Dg2fEFwcis8pZ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735915631; c=relaxed/simple; bh=xUjOITySQWqaOqf6sRQ90cBGXWhHHhX3NoFqnLcWMsU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ixc9WGSA/cyrtX8SZIasQIVbu7KccJJznwZNfHl8EX58S1FMVaAqmBhKQAQkHzXoow0qcLhoxnI9a6cTWx6P7KN5NmG1j+WhYQPVyNc3joI54EY2CzNLTSPc9JKG4IfHLYpV93L5hN0uR/ghhFhXu+IVc+xUGs6N3Swgz1K53NY= 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=OD/IM5wY; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=lPQjEEq1; arc=none smtp.client-ip=103.168.172.146 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="OD/IM5wY"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="lPQjEEq1" Received: from phl-compute-03.internal (phl-compute-03.phl.internal [10.202.2.43]) by mailfout.phl.internal (Postfix) with ESMTP id DDD0C13802FB for ; Fri, 3 Jan 2025 09:47:08 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-03.internal (MEProxy); Fri, 03 Jan 2025 09:47: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=fm2; t=1735915628; x=1736002028; bh=TVqmqhbXbytaRtxSolA9amfRVnJZ1u0XvkUzzE+ceVQ=; b= OD/IM5wYo4YWrMN3iPkWGM22QRLmW5zIR3ttpnDt9DvTaIV99cO0ECBiLWRjn1rv re17AglA5oJ5SxlkngpnPrpKfGqzQRSC/RNPKVZY6hjeHYfsA/j5h2zq/nW7lqUd HrZMWitbb39LPQX4QnWIRSXflG1CoA6btovaTyKXps5wiTYQFXfde2vj5iAX58j4 Y+RaM6axSp4oAFbxyXGqyAUhtwf50G/o2vuI/fh78Svy5zqDB/CLnuOO7Ggb6AOJ IJTWd7Vwh0EdlrSjNkA3V/tMb5kug+66iq95QuikVEH5Gu6TDUGEO3WlSbPMo5Xp PjVTr7nYKl4fJSpm9YAzDg== 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=fm2; t=1735915628; x= 1736002028; bh=TVqmqhbXbytaRtxSolA9amfRVnJZ1u0XvkUzzE+ceVQ=; b=l PQjEEq1k6Uyz/R81XoYJjYqWRvZ9qBBT8pXjiwjt1cpk1HKaAvIjHv4hzz0LQS76 h1CmyqiPod/VNIXNR7ujzyaeuiOrFl25kj3WJ1iI0/nUvf/bIDielabUClrxZCpF EEtcCAEciVpxpqgsYcouSPH7FzkNAHudapFDSfkRQjgajV734LqpJrfMNtVlsG/T FbpgA9YkpIMDE9g7XT7Sd22fHYlcVHLqajmEp2wAtfZnGQwj2HMx+/UjTOMaBjKE xFTZTjUSHFvPiPSMcdNzLtFmhfdhpFtDUi6l8IJ3WVNtf0x+3VaP42DzDQmM76F1 ilZnxv38W3RWeXIkHUQXA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudefgedgieekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucgovfgvgihtqfhnlhihqd dqteefjeefqddtgeculdehtddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeer tdertdejnecuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesph hkshdrihhmqeenucggtffrrghtthgvrhhnpeeggefglefgkeehvdegffelffekkeehudff fedvheegieegudehudekleeivedtgfenucffohhmrghinhepvhgvtghtohhrrdgttgenuc evlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehpshesphhk shdrihhmpdhnsggprhgtphhtthhopedupdhmohguvgepshhmthhpohhuthdprhgtphhtth hopehgihhtsehvghgvrhdrkhgvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 3 Jan 2025 09:47:08 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id b73b9691 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 3 Jan 2025 14:47:06 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 03 Jan 2025 15:46:41 +0100 Subject: [PATCH 04/10] github: convert all Linux jobs to be containerized Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250103-b4-pks-ci-fixes-v1-4-a9bb95dff833@pks.im> References: <20250103-b4-pks-ci-fixes-v1-0-a9bb95dff833@pks.im> In-Reply-To: <20250103-b4-pks-ci-fixes-v1-0-a9bb95dff833@pks.im> To: git@vger.kernel.org Cc: X-Mailer: b4 0.14.2 We have split the CI jobs in GitHub Workflows into two categories: - Those running on a machine pool directly. - Those running in a container on the machine pool. The latter is more flexible because it allows us to freely pick whatever container image we want to use for a specific job, while the former only allows us to pick from a handful of different distros. The containerized jobs shouldn't cause a significant slowdown, either, so they do not have any significant upside to the best of my knowlegde. The only upside that they did have before the preceding commit is that they run as a non-root user, but that has been addressed now. Convert all Linux jobs to be containerized for additional flexibility. Signed-off-by: Patrick Steinhardt --- .github/workflows/main.yml | 68 ++++++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 29 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b02f5873a540b458d38e7951b4ee3d5ca598ae23..8e5847da4fab009ad699c18e1a5a336a8b45c3ed 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -259,20 +259,6 @@ jobs: fail-fast: false matrix: vector: - - jobname: linux-sha256 - cc: clang - pool: ubuntu-latest - - jobname: linux-reftable - cc: clang - pool: ubuntu-latest - - jobname: linux-gcc - cc: gcc - cc_package: gcc-8 - pool: ubuntu-20.04 - - jobname: linux-TEST-vars - cc: gcc - cc_package: gcc-8 - pool: ubuntu-20.04 - jobname: osx-clang cc: clang pool: macos-13 @@ -285,21 +271,6 @@ jobs: - jobname: osx-meson cc: clang pool: macos-13 - - jobname: linux-gcc-default - cc: gcc - pool: ubuntu-latest - - jobname: linux-leaks - cc: gcc - pool: ubuntu-latest - - jobname: linux-reftable-leaks - cc: gcc - pool: ubuntu-latest - - jobname: linux-asan-ubsan - cc: clang - pool: ubuntu-latest - - jobname: linux-meson - cc: gcc - pool: ubuntu-latest env: CC: ${{matrix.vector.cc}} CC_PACKAGE: ${{matrix.vector.cc_package}} @@ -342,6 +313,44 @@ jobs: fail-fast: false matrix: vector: + - jobname: linux-sha256 + image: ubuntu:latest + cc: clang + distro: ubuntu-latest + - jobname: linux-reftable + image: ubuntu:latest + cc: clang + distro: ubuntu-latest + - jobname: linux-gcc + image: ubuntu:20.04 + cc: gcc + cc_package: gcc-8 + distro: ubuntu-20.04 + - jobname: linux-TEST-vars + image: ubuntu:20.04 + cc: gcc + cc_package: gcc-8 + distro: ubuntu-20.04 + - jobname: linux-gcc-default + image: ubuntu:latest + cc: gcc + distro: ubuntu-latest + - jobname: linux-leaks + image: ubuntu:latest + cc: gcc + distro: ubuntu-latest + - jobname: linux-reftable-leaks + image: ubuntu:latest + cc: gcc + distro: ubuntu-latest + - jobname: linux-asan-ubsan + image: ubuntu:latest + cc: clang + distro: ubuntu-latest + - jobname: linux-meson + image: ubuntu:latest + cc: gcc + distro: ubuntu-latest - jobname: linux-musl image: alpine distro: alpine-latest @@ -363,6 +372,7 @@ jobs: env: jobname: ${{matrix.vector.jobname}} distro: ${{matrix.vector.distro}} + CC: ${{matrix.vector.cc}} runs-on: ubuntu-latest container: ${{matrix.vector.image}} steps: From patchwork Fri Jan 3 14:46:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13925629 Received: from fhigh-a7-smtp.messagingengine.com (fhigh-a7-smtp.messagingengine.com [103.168.172.158]) (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 361981FAC3D for ; Fri, 3 Jan 2025 14:47:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.158 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735915632; cv=none; b=KcmwoYwUS13sZmINm945m/kdF3+d9n1ETIlNl+hLPDul/Ejs7Uxnb0IcAl9CcJLwzkjn/OQRIpnrmU2o7+HOKJAdgMsOuTdv7uCaRB4hRSr5S68N0hWJtB5I28LDMnM2i+UpS5wAKKMBlaGvuMJ21DFVsk4ONqszNJ2pVZI6Z8Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735915632; c=relaxed/simple; bh=zexPLNT3h6Ys4tPdyqD5I4vRjDDd3aNFUUmdR8I6FLA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=i5wpk5pp2b7hNeMljjy1PKlil2fFgw1bLuMogZ8r5HON3NLwUXMYeLhxApSgj0AjK9dpm2esing8cX49Ui7CKn+tvMvqy03J9sHh3VOkUqpBa9p3jTCClEv8128MY45hJwz+f1ltUqtndHZk71T98B+b7k4umGWJQbyXTdVdtO4= 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=kKWesVxi; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=amoahWyp; arc=none smtp.client-ip=103.168.172.158 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="kKWesVxi"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="amoahWyp" Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfhigh.phl.internal (Postfix) with ESMTP id 0E977114015E for ; Fri, 3 Jan 2025 09:47:09 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-12.internal (MEProxy); Fri, 03 Jan 2025 09:47: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=fm2; t=1735915629; x=1736002029; bh=sn+TIcCrlFSiTm+D9WefCan97PWIUoOwwisrZzF7BtM=; b= kKWesVxildkIt7OY0F01lZu/Mhsj/J7NKwmZrtiswPSFpi0mDG367v3MCFssLSRA AF6WzdTWeJtA5eQS/Oedz4ztdUDM7ztaGfX2HYgu0qF9j5mw4Xg+mgIEERlGsXtm BWbFbjwm99j6u962+KN2Il9sSYzZ5r+lZX8wQibHX3RhJ1MyLnDh49JRZVw9eTA9 EmoKTW9YtANE+1evxI9XF6v8rS7Z7trcULnZSv1gjApwQJ6jRr1bQ07I8rJEffcP f2qlbN9mGci73iG0L54m+fjQJEQ96qIUynmB1Yr86HLX2JOwxVQkHmZQNUr3L1iu VMc6byhEWGJp+lxbDQY5JA== 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=fm2; t=1735915629; x= 1736002029; bh=sn+TIcCrlFSiTm+D9WefCan97PWIUoOwwisrZzF7BtM=; b=a moahWyp1ztnX27wqbKQB64YetJodLiqMQYgr8j3FM9FRiTlSKtqGTSt27Jjzl3Yf aoopSFDgh6lHmzfCcMd8eAO7CZ+OnQKoiSKnvEwUToWpYaaGv3wrBL7r2sfie4TI aPImr4Tz/mM3Wht7y8+qzcoCRZK5h4ymaYMZQpHLFu34+CBZOXtxJVSZrOkSCkux 1WZG752YsdISAha47T2jkM0o78VrKK8wkVp6FBA7aiILBCkTxExy6vcE84qbnG8e fHj5ZLm2KBf/yYXtSvXgkSYeNZe9tknpLMflJNgQ/HH9vqtDvyqMNVpnov2HH/zq KqktyAeTllxYSscjo0Wng== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudefgedgieekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucgovfgvgihtqfhnlhihqd dqteefjeefqddtgeculdehtddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeer tdertdejnecuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesph hkshdrihhmqeenucggtffrrghtthgvrhhnpeeggefglefgkeehvdegffelffekkeehudff fedvheegieegudehudekleeivedtgfenucffohhmrghinhepvhgvtghtohhrrdgttgenuc evlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehpshesphhk shdrihhmpdhnsggprhgtphhtthhopedupdhmohguvgepshhmthhpohhuthdprhgtphhtth hopehgihhtsehvghgvrhdrkhgvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 3 Jan 2025 09:47:08 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 31f84a3c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 3 Jan 2025 14:47:07 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 03 Jan 2025 15:46:42 +0100 Subject: [PATCH 05/10] github: simplify computation of the job's distro Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250103-b4-pks-ci-fixes-v1-5-a9bb95dff833@pks.im> References: <20250103-b4-pks-ci-fixes-v1-0-a9bb95dff833@pks.im> In-Reply-To: <20250103-b4-pks-ci-fixes-v1-0-a9bb95dff833@pks.im> To: git@vger.kernel.org Cc: X-Mailer: b4 0.14.2 We explicitly list the distro of Linux-based jobs, but it is equivalent to the name of the image in almost all cases, except that colons are replaced with dashes. Drop the redundant information and massage it in our CI scripts, which is equivalent to how we do it in GitLab CI. There are a couple of exceptions: - The "linux32" job, w whose distro name is different than the image name. This is handled by adapting all sites to use the new name. - The "alpine" and "fedora" jobs, neither of which specify a tag for their image. This is handled by adding the "latest" tag. Signed-off-by: Patrick Steinhardt --- .github/workflows/main.yml | 22 ++++------------------ ci/install-dependencies.sh | 4 ++-- ci/lib.sh | 2 ++ 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8e5847da4fab009ad699c18e1a5a336a8b45c3ed..b54da639a650682495994e3c7b137eab4e6cb3bf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -275,7 +275,7 @@ jobs: CC: ${{matrix.vector.cc}} CC_PACKAGE: ${{matrix.vector.cc_package}} jobname: ${{matrix.vector.jobname}} - distro: ${{matrix.vector.pool}} + CI_JOB_IMAGE: ${{matrix.vector.pool}} TEST_OUTPUT_DIRECTORY: ${{github.workspace}}/t runs-on: ${{matrix.vector.pool}} steps: @@ -316,63 +316,49 @@ jobs: - jobname: linux-sha256 image: ubuntu:latest cc: clang - distro: ubuntu-latest - jobname: linux-reftable image: ubuntu:latest cc: clang - distro: ubuntu-latest - jobname: linux-gcc image: ubuntu:20.04 cc: gcc cc_package: gcc-8 - distro: ubuntu-20.04 - jobname: linux-TEST-vars image: ubuntu:20.04 cc: gcc cc_package: gcc-8 - distro: ubuntu-20.04 - jobname: linux-gcc-default image: ubuntu:latest cc: gcc - distro: ubuntu-latest - jobname: linux-leaks image: ubuntu:latest cc: gcc - distro: ubuntu-latest - jobname: linux-reftable-leaks image: ubuntu:latest cc: gcc - distro: ubuntu-latest - jobname: linux-asan-ubsan image: ubuntu:latest cc: clang - distro: ubuntu-latest - jobname: linux-meson image: ubuntu:latest cc: gcc - distro: ubuntu-latest - jobname: linux-musl - image: alpine - distro: alpine-latest + image: alpine:latest # Supported until 2025-04-02. - jobname: linux32 image: i386/ubuntu:focal - distro: ubuntu32-20.04 - jobname: pedantic - image: fedora - distro: fedora-latest + image: fedora:latest # A RHEL 8 compatible distro. Supported until 2029-05-31. - jobname: almalinux-8 image: almalinux:8 - distro: almalinux-8 # Supported until 2026-08-31. - jobname: debian-11 image: debian:11 - distro: debian-11 env: jobname: ${{matrix.vector.jobname}} - distro: ${{matrix.vector.distro}} CC: ${{matrix.vector.cc}} + CI_JOB_IMAGE: ${{matrix.vector.image}} runs-on: ubuntu-latest container: ${{matrix.vector.image}} steps: diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index ecb5b9d36c20d3e7e96148ac628a96c62642c308..d5a959e25ff3236656ff3416b81732ec5c2107c1 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -33,7 +33,7 @@ fedora-*|almalinux-*) dnf -yq update >/dev/null && dnf -yq install shadow-utils sudo make gcc findutils diffutils perl python3 gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel >/dev/null ;; -ubuntu-*|ubuntu32-*|debian-*) +ubuntu-*|i386/ubuntu-*|debian-*) # Required so that apt doesn't wait for user input on certain packages. export DEBIAN_FRONTEND=noninteractive @@ -42,7 +42,7 @@ ubuntu-*|ubuntu32-*|debian-*) SVN='libsvn-perl subversion' LANGUAGES='language-pack-is' ;; - ubuntu32-*) + i386/ubuntu-*) SVN= LANGUAGES='language-pack-is' ;; diff --git a/ci/lib.sh b/ci/lib.sh index 8885ee3c3f86c62e8783d27756b8779bd491e7e6..f8b68ab8a6546802756fd516ca15a2c97223da5f 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -246,6 +246,8 @@ then GIT_TEST_OPTS="--github-workflow-markup" JOBS=10 + + distro=$(echo "$CI_JOB_IMAGE" | tr : -) elif test true = "$GITLAB_CI" then CI_TYPE=gitlab-ci From patchwork Fri Jan 3 14:46:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13925630 Received: from fout-a3-smtp.messagingengine.com (fout-a3-smtp.messagingengine.com [103.168.172.146]) (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 361041FA8F1 for ; Fri, 3 Jan 2025 14:47:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.146 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735915631; cv=none; b=uEytpTzoa9kAO5VWMJzM1vw4ISl+JxrGXAufURM6cAKfqfW3jVPgkUOaDNoQxQdgL24pIo2e8uM7RcYZUV9upzGFBLuxksgBnRtrEf7YtgdNNxr2RbR8nQi00jpU8b3HMTHckGXB1RsTYlofNA11piGsTfq/fGN2y2YXsNy8pR0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735915631; c=relaxed/simple; bh=ag0LjdPz1is6+wSZ6RpWja+1quW6UZ22PPZqgSzH9j8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=r5A61/2FlezyZTlBrMSjOg8tsfm+nQfVyVO44ZwkqReNZT6uh3Xno/6Acu5HysO9KkauWmCIlAGOT1ZYQIO7BzbVTELNM3nrEjpYpMRiOTR5JC95vapZS8YNLQPxoijw8pmmlY9NVs8Ocgpz96uc62mkqR78Yl0EIo/z4928Sl8= 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=hU+lqgei; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=DDQYm8+a; arc=none smtp.client-ip=103.168.172.146 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="hU+lqgei"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="DDQYm8+a" Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfout.phl.internal (Postfix) with ESMTP id 17C0D1380677 for ; Fri, 3 Jan 2025 09:47:09 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-12.internal (MEProxy); Fri, 03 Jan 2025 09:47: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=fm2; t=1735915629; x=1736002029; bh=Atwd77NT7D3mRyg8Qw4wyrfdolqj/IFeSJ1NkBdBIJQ=; b= hU+lqgeih3Kt+2/INJeR1Hf2GUgb1Mj5Xb/n+7cA4qba2g9KHnUtZ3UKGMRPs10R a3RjAhgfkZtNrOkgZ81LKLrmIAKk328RvRpsOc6ZLV7DXK+9rPMybCunMBxUd/vr mpmY3auo288fv0T94BaWLgqYEeAfaWyYF+qqZmHjRaZl/lSdXs0hy7HE6XUk1mIy F1AonoEI0oG4f6OyphCowiU4njz6OhfGmp2UVLPVtAOGv3zNT0GBYDJkCWBf4ff0 1kPmU0GQTd5Pe6JhSGC/JvhncxAHBkkTNKbxiR8AhcIsVX53L26GK+/K/8CpAQ+2 P2j4ykt5+/+NxecdUgFoNw== 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=fm2; t=1735915629; x= 1736002029; bh=Atwd77NT7D3mRyg8Qw4wyrfdolqj/IFeSJ1NkBdBIJQ=; b=D DQYm8+a3+luFsbLtFVf+fjeGP5mXEM0APMJT9sOgOqBxQcag9IvmyjUHCsC1hDgD FFKDhlqK+auYsUp6ilbsIblBCoTZom+ZDJPBFX/m0UKf9ZPUOaJOREbO/6lGfKp4 VV7hP86p6aHo2NlnrYLt6AEu9iWGxUn4K17aFPhZwoY1ehNUYS31VVToVPCcL+Yi omNRQv/RmQ/6nlL5VvucQbxp+yHNGyBLHdsKCldx1ViDexDwnHdPlsvyLuzuwch9 9VpsOuBkKMb/32fVrOnRdZsEMoCDUmuE9rOmMcZ6JzH2xGQxhPhcqKgcs3FADVfD x1e1ogWx5CgeMg3Q2QCOA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudefgedgieekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhfffugg gtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufhtvghi nhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepffeuieduje dvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimhdpnh gspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhithes vhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 3 Jan 2025 09:47:08 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 170e099e (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 3 Jan 2025 14:47:08 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 03 Jan 2025 15:46:43 +0100 Subject: [PATCH 06/10] gitlab-ci: remove the "linux-old" job Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250103-b4-pks-ci-fixes-v1-6-a9bb95dff833@pks.im> References: <20250103-b4-pks-ci-fixes-v1-0-a9bb95dff833@pks.im> In-Reply-To: <20250103-b4-pks-ci-fixes-v1-0-a9bb95dff833@pks.im> To: git@vger.kernel.org Cc: X-Mailer: b4 0.14.2 The "linux-old" job was historically testing against the oldest supported LTS release of Ubuntu. But with c85bcb5de1 (gitlab-ci: switch from Ubuntu 16.04 to 20.04, 2024-10-31) it has been converted to test against Ubuntu 20.04, which already gets exercised in a couple of other CI jobs. It's thus not adding any significant test coverage. Drop the job. Signed-off-by: Patrick Steinhardt --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9254e01583306e67dc12b6b9e0015183e1108655..00bc727865031620752771af4a9030c7de1b73df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,9 +36,6 @@ test:linux: fi parallel: matrix: - - jobname: linux-old - image: ubuntu:20.04 - CC: gcc - jobname: linux-sha256 image: ubuntu:latest CC: clang From patchwork Fri Jan 3 14:46:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13925632 Received: from fhigh-a7-smtp.messagingengine.com (fhigh-a7-smtp.messagingengine.com [103.168.172.158]) (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 CAB891FA170 for ; Fri, 3 Jan 2025 14:47:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.158 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735915636; cv=none; b=PhIXCUq3mUZWsafaOYXMPfydvsqo9QN/ObCfolQe5kR6draBVg2Ym4yHzcRFqgYuv3cz6s/cGOY4CQrb9/Rx+1vEtSN1TW2G280pYASNL4PfCsrdP8yNIIUTvlncm+plwVNzI0GPZcgxpg1ps8NzrJ5AguNXWvEffUO1rr6dKDc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735915636; c=relaxed/simple; bh=uCLcNqLoXjmDM+uus7WLtHwnNKHtE5tgJV8SzY6jxFg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=K0NKJM9ikqKYA7F1XittuNZ/+J+T2vtXr8DkO80m3G2lHlonHgJSOJYForCGPh9FhW/bNJGfqHum582W2FNwNuOlKdR5nO4Mb7aRf2207BZg3HYReNjODjonkNWej7ozmozZal9W6ILZ+JbNH2L4taCR0YBjWPL1CZr8Hx8Tw7o= 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=gtr2V9sY; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=fca9IM1n; arc=none smtp.client-ip=103.168.172.158 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="gtr2V9sY"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="fca9IM1n" Received: from phl-compute-02.internal (phl-compute-02.phl.internal [10.202.2.42]) by mailfhigh.phl.internal (Postfix) with ESMTP id E1B411140161 for ; Fri, 3 Jan 2025 09:47:13 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-02.internal (MEProxy); Fri, 03 Jan 2025 09:47:13 -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=fm2; t=1735915633; x=1736002033; bh=CsnXTabSIyHnxO2MuGx/cC6N+6oF8O0hrgOakeGfitE=; b= gtr2V9sYwDJSCIfLTO73rflKNbfpmPy2AXQS4z8PlHThY3BUPSGzT6vU0IV6gQq2 0yZ4zSy2QRbCGRs9wvMt9zk3G7VpBWfT1h8tN7RGMdVyivwFfUu+iZO23vm0dlep BDe8xAlOsrooQZAfypyNj0UoBdkAbXloZ8tI6+qwMm+FtSVuVrZyEbLZ7eyLFJ5F aXFZV2XLAPI6AQTez+75eomaNs+IVtDdxEaygxiqFxr+x8LUzQ3Mpa2+/1ggNC4w k9zXe2oz4IDnPah1Be7cXbasOhk+WxnDCbdTWMpYIT5RYesRGWQBip5QIa4i88aa aKqjyNuhZmB0N9J+LoGh4Q== 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=fm2; t=1735915633; x= 1736002033; bh=CsnXTabSIyHnxO2MuGx/cC6N+6oF8O0hrgOakeGfitE=; b=f ca9IM1nzgS2Io1ObICx3fBQJvS07GK8oqE/SC02MleTz1VPCsFEsyapIqzkBujy5 fE99iNHVhz2Kpk0bhmQcKKHUZEAoEkn7Ev+XCsN5JfXIVcbmD1edlvR3DNtkl26n JDJd7k079qDvlpkf7icJos02WHJkDp8aD2Rba/c8PbE055iyLeFS29oUj42w1Wxp 2apccsSPUV6tkszpDVsbJ0UHmyr/5cCk9OZOYXvA6L64ozT40rfnJztfCWVl10U/ 8jD296uHU0BkUexSRgy+Ry6nCwxf+1R+0n304e6Q8Z6rSkSqvJj8eHgBX59Krvm6 r2M+dEl/LbMeTB/YGkZRA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudefgedgieekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhfffugg gtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufhtvghi nhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepffeuieduje dvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimhdpnh gspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhithes vhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 3 Jan 2025 09:47:13 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 30f3fda7 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 3 Jan 2025 14:47:09 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 03 Jan 2025 15:46:44 +0100 Subject: [PATCH 07/10] gitlab-ci: add linux32 job testing against i386 Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250103-b4-pks-ci-fixes-v1-7-a9bb95dff833@pks.im> References: <20250103-b4-pks-ci-fixes-v1-0-a9bb95dff833@pks.im> In-Reply-To: <20250103-b4-pks-ci-fixes-v1-0-a9bb95dff833@pks.im> To: git@vger.kernel.org Cc: X-Mailer: b4 0.14.2 Add another job to GitLab CI that tests against the i386 architecture. This job is equivalent to the same job in GitHub Workflows. Signed-off-by: Patrick Steinhardt --- .gitlab-ci.yml | 2 ++ ci/lib.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00bc727865031620752771af4a9030c7de1b73df..29e9056dd5010f8843e42aeae8410973c825de54 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,6 +66,8 @@ test:linux: image: fedora:latest - jobname: linux-musl image: alpine:latest + - jobname: linux32 + image: i386/ubuntu:20.04 - jobname: linux-meson image: ubuntu:latest CC: gcc diff --git a/ci/lib.sh b/ci/lib.sh index f8b68ab8a6546802756fd516ca15a2c97223da5f..2293849ada3b45873f80e4392ab93c65657d0f13 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -269,7 +269,7 @@ then CI_OS_NAME=osx JOBS=$(nproc) ;; - *,alpine:*|*,fedora:*|*,ubuntu:*) + *,alpine:*|*,fedora:*|*,ubuntu:*|*,i386/ubuntu:*) CI_OS_NAME=linux JOBS=$(nproc) ;; From patchwork Fri Jan 3 14:46:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13925633 Received: from fout-a3-smtp.messagingengine.com (fout-a3-smtp.messagingengine.com [103.168.172.146]) (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 B5A4D1FBCA0 for ; Fri, 3 Jan 2025 14:47:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.146 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735915637; cv=none; b=hqlAepZHtqKfVscvjvR6EgAmqdAJqQP1cj4csoKYeMsLl+CDoTCADUzim6dZsbuYzbzJ2014prXpJWtCKE/WxmDhc2U24uV4ntjNFY1HNU2zxW+EPtP5KxjCC0J25QOtgbqW3920WmEf5lrecHrzmThIpxa8sD0eiCKdtBqr3uI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735915637; c=relaxed/simple; bh=P+v8Mc/qPApKyabATAa9egObyGr2AwtUVDH/PYFah68=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NJiZqTrouTERURuPplm+bvxArAwveAekKPCvBOuNp6+91/iJg855OXpseZdOc5BDXOpcjlf+pRa2mQLZh93BJU2Mu/2BeMu9YP50ToIpaJaWlyBcwUqfnZT+PdVvRq0KqmnXnDxcOxHb3q3X8QDsvk/busGg2VCDu7ZGyEFLL2A= 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=tOdugH73; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=EF/7Ikbo; arc=none smtp.client-ip=103.168.172.146 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="tOdugH73"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="EF/7Ikbo" Received: from phl-compute-03.internal (phl-compute-03.phl.internal [10.202.2.43]) by mailfout.phl.internal (Postfix) with ESMTP id B6A8B13802FB for ; Fri, 3 Jan 2025 09:47:14 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-03.internal (MEProxy); Fri, 03 Jan 2025 09:47:14 -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=fm2; t=1735915634; x=1736002034; bh=AnRIxFRbt8HbaCvzozuFuZ/dYSxnaW8wdxdEC0MBHzU=; b= tOdugH73zXPUFAlIke+MlJkqSA28yUdhNSLrBKkSPKMKcbzgndvYccA7Dt+/YzTt /notLBfjQ31BTL+09WtLFYXJFg+E7IvbAk1prSBSBVBUnwpJOdrTsCwu1V3gy0uP KvfVJ7e0HrTNhm0+W1vvkomcoG9XMcGlUx6B1rjCVHIOblrUf3KssB14gqOa4pi0 bdYwfLbJ/NkT1gF58dUUw2pMCSYgNexdVK8ILv0lrjncT/balje5tamvGqsqyyYK YWhOPksybyCZ9frZ4EZLFqEGvdxBJyeobc+n8ubrefkVhvVFSJeQTkCwHB75s56+ dx6aBtd7LK5QsmFxAUV5Rw== 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=fm2; t=1735915634; x= 1736002034; bh=AnRIxFRbt8HbaCvzozuFuZ/dYSxnaW8wdxdEC0MBHzU=; b=E F/7IkbokAJp+xAUgJgamAdCsEK1A7IOReFzSw2pggE9icOH7cIpjlQu4rTrQx0m1 DmxyMrQ2uyCJosri68aXDt4tTm7sUqD9Gss5fluSea0AA4nvt+7jQJszaT0cFGWo WZVFYOFROq2buNlQAVJdcwdCCO1MMrRaQ0bwjv1je0zRZ5L8snxpwCYjYW+CvWCC OYkJF/KxIonbxQ8ER33cC4PPpnBwHp2cy+3pyfnEtNikpaFXZyaE3xhuZtD+GfSv 24BvrCVlou2jryK7VUufVfRX+u9oEQbB2AHpHDaXg8CxSJ1WJzjs/nyIXOrkL+jI hrPqPd9Bv/1uitxEXH81A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudefgedgieekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhfffugg gtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufhtvghi nhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepffeuieduje dvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecuvehluhhsthgv rhfuihiivgepudenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimhdpnh gspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhithes vhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 3 Jan 2025 09:47:14 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 2a0acf53 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 3 Jan 2025 14:47:10 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 03 Jan 2025 15:46:45 +0100 Subject: [PATCH 08/10] ci: stop special-casing for Ubuntu 16.04 Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250103-b4-pks-ci-fixes-v1-8-a9bb95dff833@pks.im> References: <20250103-b4-pks-ci-fixes-v1-0-a9bb95dff833@pks.im> In-Reply-To: <20250103-b4-pks-ci-fixes-v1-0-a9bb95dff833@pks.im> To: git@vger.kernel.org Cc: X-Mailer: b4 0.14.2 With c85bcb5de1 (gitlab-ci: switch from Ubuntu 16.04 to 20.04, 2024-10-31) we have adapted the last CI job to stop using Ubuntu 16.04 in favor of Ubuntu 20.04. Remove the special-casing we still have in our CI scripts. Signed-off-by: Patrick Steinhardt --- ci/lib.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/ci/lib.sh b/ci/lib.sh index 2293849ada3b45873f80e4392ab93c65657d0f13..77a4aabdb8fb416c1733f02d02145b6bc0849998 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -347,14 +347,7 @@ ubuntu-*) fi MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/$PYTHON_PACKAGE" - case "$distro" in - ubuntu-16.04) - # Apache is too old for HTTP/2. - ;; - *) - export GIT_TEST_HTTPD=true - ;; - esac + export GIT_TEST_HTTPD=true # The Linux build installs the defined dependency versions below. # The OS X build installs much more recent versions, whichever From patchwork Fri Jan 3 14:46:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13925634 Received: from fhigh-a7-smtp.messagingengine.com (fhigh-a7-smtp.messagingengine.com [103.168.172.158]) (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 6C4071FA24E for ; Fri, 3 Jan 2025 14:47:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.158 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735915638; cv=none; b=dUOqG9uQE8Hwu/rmunrkbDziUpAN+79G0bpYhvbhmHwSLaGmOqfhXBuz5tarQf5LRSMnEfRc/I0bWPWWoH8X1PSl316f8WxUyFfNL5IFPSsjPRaXk4ai0bqU93ZcFyhDnzmHyGa3g95BDzxYGIB7IeziioVlW0l5Jb2OrKA6OEY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735915638; c=relaxed/simple; bh=Sy9x2uRQOGhw34pM7H/T6FlmFGuXfG3ac/+z39jl6/g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YIP7W+civABaeWvR+P/5rSoNy6+DMtVMmKyaAU9qP5VpTdzr2XkdXYxBGgWTO19kKMc5w9Bk0PcoJVDD4nZyKM71iegTVhXpVC/lsrfWaEpWxN++aMflRjfXSD3PpkQ/Z7B333WXa2NdEV7rJO/AoXnEquzMSRIDLgQ0ehh2n1o= 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=jqbOxq5T; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=tcNYJvqq; arc=none smtp.client-ip=103.168.172.158 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="jqbOxq5T"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="tcNYJvqq" Received: from phl-compute-03.internal (phl-compute-03.phl.internal [10.202.2.43]) by mailfhigh.phl.internal (Postfix) with ESMTP id 8F843114017A for ; Fri, 3 Jan 2025 09:47:15 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-03.internal (MEProxy); Fri, 03 Jan 2025 09:47:15 -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=fm2; t=1735915635; x=1736002035; bh=bcDVEZTQSNn1yj5tPT96oo3OXMp6EK6q1zhc2+i1s10=; b= jqbOxq5Tk1F9DqkeD7HuMyzTK3l7/6AMZqudspA3SoqUfotQz4yefb+4e+ux83yP YXJzt4DoqzG0M7GuuASFyLM08bFHRFvooA1wxLE1MRwfVGSacC3h10ZtK15NWF16 /I/JIbqV7RgVBIp+uX0mCciJVrzqSHKhp1JgqlZIc1kvNf+D6QsoARThseX4KgAT gSRKXJPQt06qY63QnYm3AHBuRYrtMDKSsat0i8WZBHzMKunGwdZeK/8iYwkom1z6 tvRKBA82L9JgXA9VI24yq7QWps0niWPjfP2v2//5nGoGSzW70k8ZNNk5kNu/DR/x pEnrL4s/z7+f3Hl972OsGg== 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=fm2; t=1735915635; x= 1736002035; bh=bcDVEZTQSNn1yj5tPT96oo3OXMp6EK6q1zhc2+i1s10=; b=t cNYJvqqx6c+ki0gi3ES01l3ZGL7/8eoWpScYXBhLv1pcro54Zrm2+kO65yGknNdY rL2Bdqe4CSgk10J9dWat3czQkTP4QDMG924R0snsQY2LtvCjYO2fbC+m2kM5kTKP Se7RuJ4ELtyulzsBsD20eSpX+Q0GlaXbkyJA5otf0+C/U4YXbHlOnQAO9vQAtPbJ scf/fp00EQQRF8xzH4AVS0qD5B7HZzA1QGq7t03jVezqXlwDyoHGSIP+Kgm8Gofm IsvFaniwfPbV3CEJPtSqawRu4untccBMmnZLPhmgdk3dfarYbF0aFc+hReh4dbQH l2riGDTi4cj5YNj66j6+A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudefgedgieekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhfffugg gtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufhtvghi nhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepffeuieduje dvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecuvehluhhsthgv rhfuihiivgepvdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimhdpnh gspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhithes vhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 3 Jan 2025 09:47:14 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 6d73591e (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 3 Jan 2025 14:47:10 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 03 Jan 2025 15:46:46 +0100 Subject: [PATCH 09/10] ci: use latest Ubuntu release Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250103-b4-pks-ci-fixes-v1-9-a9bb95dff833@pks.im> References: <20250103-b4-pks-ci-fixes-v1-0-a9bb95dff833@pks.im> In-Reply-To: <20250103-b4-pks-ci-fixes-v1-0-a9bb95dff833@pks.im> To: git@vger.kernel.org Cc: X-Mailer: b4 0.14.2 Both GitHub Actions and GitLab CI use the "ubuntu:latest" tag as the default image for most jobs. This tag is somewhat misleading though, as it does not refer to the latest release of Ubuntu, but to the latest LTS release thereof. But as we already have a couple of jobs exercising the oldest LTS release of Ubuntu that Git still supports, it would make more sense to test the oldest and youngest versions of Ubuntu. Adapt these jobs to instead use the "ubuntu:rolling" tag, which refers to the actual latest release, which currently is Ubuntu 24.10. Signed-off-by: Patrick Steinhardt --- .github/workflows/main.yml | 14 +++++++------- .gitlab-ci.yml | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b54da639a650682495994e3c7b137eab4e6cb3bf..b90381ae015edf9db5aa4b8c0ace9bb5c549c37b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -314,10 +314,10 @@ jobs: matrix: vector: - jobname: linux-sha256 - image: ubuntu:latest + image: ubuntu:rolling cc: clang - jobname: linux-reftable - image: ubuntu:latest + image: ubuntu:rolling cc: clang - jobname: linux-gcc image: ubuntu:20.04 @@ -328,19 +328,19 @@ jobs: cc: gcc cc_package: gcc-8 - jobname: linux-gcc-default - image: ubuntu:latest + image: ubuntu:rolling cc: gcc - jobname: linux-leaks - image: ubuntu:latest + image: ubuntu:rolling cc: gcc - jobname: linux-reftable-leaks - image: ubuntu:latest + image: ubuntu:rolling cc: gcc - jobname: linux-asan-ubsan - image: ubuntu:latest + image: ubuntu:rolling cc: clang - jobname: linux-meson - image: ubuntu:latest + image: ubuntu:rolling cc: gcc - jobname: linux-musl image: alpine:latest diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 29e9056dd5010f8843e42aeae8410973c825de54..8ed3ff5f0373d70b6f609dc5292dda2dd7fd8f88 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,10 +37,10 @@ test:linux: parallel: matrix: - jobname: linux-sha256 - image: ubuntu:latest + image: ubuntu:rolling CC: clang - jobname: linux-reftable - image: ubuntu:latest + image: ubuntu:rolling CC: clang - jobname: linux-gcc image: ubuntu:20.04 @@ -51,16 +51,16 @@ test:linux: CC: gcc CC_PACKAGE: gcc-8 - jobname: linux-gcc-default - image: ubuntu:latest + image: ubuntu:rolling CC: gcc - jobname: linux-leaks - image: ubuntu:latest + image: ubuntu:rolling CC: gcc - jobname: linux-reftable-leaks - image: ubuntu:latest + image: ubuntu:rolling CC: gcc - jobname: linux-asan-ubsan - image: ubuntu:latest + image: ubuntu:rolling CC: clang - jobname: pedantic image: fedora:latest @@ -69,7 +69,7 @@ test:linux: - jobname: linux32 image: i386/ubuntu:20.04 - jobname: linux-meson - image: ubuntu:latest + image: ubuntu:rolling CC: gcc artifacts: paths: From patchwork Fri Jan 3 14:46:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13925635 Received: from fout-a3-smtp.messagingengine.com (fout-a3-smtp.messagingengine.com [103.168.172.146]) (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 3345F1FAC25 for ; Fri, 3 Jan 2025 14:47:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.146 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735915638; cv=none; b=i4Q7Msp8dm7XqgrrvIFCE5p3WLpA0AbRTMYrK21AEKUfVJVHaO8LeQGCYnZchHkSuXXK3mBt5k13pEFk87+Nnlbw4b/EFvKDEcsEOfC/PfmaHGbJTEVONw0iuAnRw6QfPCDFkHnsvhMNTvpWKpW1sh8KmnTAQdOf3G+FT1NXpyY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735915638; c=relaxed/simple; bh=0rSKFF3iAy52o81GngynxsGjGl8RJIHZIAuCsssqeLM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PehX8k6dpFrFHlZXvTM9f3W/s+F06gzfjnRcJt50KyRylHA6eeqfMU/A4BGeZ0uwblkNcO53yGNAdLxPhbbYEE1K6J0a5T/sW0fQGPQ5mZCPn0Tu7UjCckrOsRwvId70AynnwiYt4ueOLoq0d3+ExhjjHofyeitLTYQLb4rzYxg= 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=F4dzZJna; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=w/g/+A1N; arc=none smtp.client-ip=103.168.172.146 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="F4dzZJna"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="w/g/+A1N" Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfout.phl.internal (Postfix) with ESMTP id 7968F138052E for ; Fri, 3 Jan 2025 09:47:16 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-11.internal (MEProxy); Fri, 03 Jan 2025 09:47:16 -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=fm2; t=1735915636; x=1736002036; bh=7uH+QxDgqjIsbI5W0WODNMawlRG9o2VBXVxCmmjmmeM=; b= F4dzZJnaFbnTf+eMHM4mVV5C0GJk1Od6dGeBgEvRKtKwlwjTgaQ4UX30dHUJB1jt 1Ba6PFiOPnG5bQfxmpmmEqfTGiIme+TsdfyKyf4imgcWBtYwoSWW5F0yJf6VnT8t q7EenDeSbSWSoXAkKSGHPga7iiOSG59zOgNuXBN0fJmue5yc+tb8/a8pWI2I4hWa X/hJ6+IlK0xTzwckXjCfuuZayY7UqLAICHIJyfir5d2QfeN6wWURouTWq13/ryjB RfiaKCrJvgAUKAWn4P/vuBOKdXxt8qgUI0oUUwgwq9kF0dWVCTmg0MQ2bxvUlOx7 TIVjrNFwTPD2B1c/HVjnUQ== 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=fm2; t=1735915636; x= 1736002036; bh=7uH+QxDgqjIsbI5W0WODNMawlRG9o2VBXVxCmmjmmeM=; b=w /g/+A1NDpbYYvtRbSHUqu8pUnXQYGo+zv4b6ki1MjT/qthXbDzmRk1bT6MhNo0Pq pDtU+FcEqk0dvgBUaH8T+thZ1py5Hf8W3R4dE73YsKECpzCuUSfjlgWCSl5NeizF rHpHjqtU58nV0FSSIX4stOGOxqLY0jZnATjAxHIMDshYIitEHQ7aevZHIgHVgup5 wNep06LJqQX25fTOC0XoLWaIxSuvvFVHe5tF5Jzf/W2nzd+g33FidmJW9ll4ACMs UWG+QHGD8n4vvqMIi94VHFu+JRQx7v+GvXWMKv6aU9iETfHedbGYKHZ7QVZyuQG2 ssK2ZshYBdOK7tnkpc/DA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudefgedgieekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhfffugg gtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufhtvghi nhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepffeuieduje dvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimhdpnh gspghrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhithes vhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 3 Jan 2025 09:47:15 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 1a569235 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 3 Jan 2025 14:47:11 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 03 Jan 2025 15:46:47 +0100 Subject: [PATCH 10/10] ci: remove stale code for Azure Pipelines Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250103-b4-pks-ci-fixes-v1-10-a9bb95dff833@pks.im> References: <20250103-b4-pks-ci-fixes-v1-0-a9bb95dff833@pks.im> In-Reply-To: <20250103-b4-pks-ci-fixes-v1-0-a9bb95dff833@pks.im> To: git@vger.kernel.org Cc: X-Mailer: b4 0.14.2 Support for Azure Pipelines has been retired in 6081d3898f (ci: retire the Azure Pipelines definition, 2020-04-11) in favor of GitHub Actions. Our CI library still has some infrastructure left for Azure though that is now unused. Remove it. Signed-off-by: Patrick Steinhardt --- ci/lib.sh | 21 +-------------------- ci/print-test-failures.sh | 5 ----- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/ci/lib.sh b/ci/lib.sh index 77a4aabdb8fb416c1733f02d02145b6bc0849998..4003354f16c048b969c0bb4340d2ee2777767300 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -206,26 +206,7 @@ export TERM=${TERM:-dumb} # Clear MAKEFLAGS that may come from the outside world. export MAKEFLAGS= -if test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI" -then - CI_TYPE=azure-pipelines - # We are running in Azure Pipelines - CI_BRANCH="$BUILD_SOURCEBRANCH" - CI_COMMIT="$BUILD_SOURCEVERSION" - CI_JOB_ID="$BUILD_BUILDID" - CI_JOB_NUMBER="$BUILD_BUILDNUMBER" - CI_OS_NAME="$(echo "$AGENT_OS" | tr A-Z a-z)" - test darwin != "$CI_OS_NAME" || CI_OS_NAME=osx - CI_REPO_SLUG="$(expr "$BUILD_REPOSITORY_URI" : '.*/\([^/]*/[^/]*\)$')" - CC="${CC:-gcc}" - - # use a subdirectory of the cache dir (because the file share is shared - # among *all* phases) - cache_dir="$HOME/test-cache/$SYSTEM_PHASENAME" - - GIT_TEST_OPTS="--write-junit-xml" - JOBS=10 -elif test true = "$GITHUB_ACTIONS" +if test true = "$GITHUB_ACTIONS" then CI_TYPE=github-actions CI_BRANCH="$GITHUB_REF" diff --git a/ci/print-test-failures.sh b/ci/print-test-failures.sh index 655687dd827e5b3e4d4879803b0d4499e7751380..dc910e51609cd7344b1ad03fdb4e820e47ad3a88 100755 --- a/ci/print-test-failures.sh +++ b/ci/print-test-failures.sh @@ -39,11 +39,6 @@ do test_name="${test_name##*/}" trash_dir="trash directory.$test_name" case "$CI_TYPE" in - azure-pipelines) - mkdir -p failed-test-artifacts - mv "$trash_dir" failed-test-artifacts - continue - ;; github-actions) mkdir -p failed-test-artifacts echo "FAILED_TEST_ARTIFACTS=${TEST_OUTPUT_DIRECTORY:t}/failed-test-artifacts" >>$GITHUB_ENV