From patchwork Fri Jan 10 11:31:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13934320 Received: from fhigh-a5-smtp.messagingengine.com (fhigh-a5-smtp.messagingengine.com [103.168.172.156]) (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 DDCF41714AC for ; Fri, 10 Jan 2025 11:32:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.156 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736508726; cv=none; b=krBGZ4+C/u6hmGrCxzAksHIpGPVoyiKKACFS84Y9miPxCQc5v0o4ZNTWmbRcK0vqLOATAgU8HdsY1WYDp2l0wubQB0/HT3kFKuYW5ycBWJD4GdoJ7JNRYNwSxPd3Y9xnfvWfdad1aKxKIHWxPZ0UEyYClsWsz11nxOYern89jQo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736508726; c=relaxed/simple; bh=WWC92ZoEIct9hgT478fYMZQxt8KV9UWVryGh7h/2YSM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IDI8J5SKn/ofyOkhWa/frYw8hzTgDsWc6N8N04Gx36mSWSPTMkfFvWEmsUhjjr+Yw7SNKv4wslqconxXWKDYw1AqbGv5UiQw/wwNDf0N/D/T0gBGQd4AD2LJOmYyCCXANQDHVsfMI/dLCWxwxzd0fENvlYUm6AvKtEg8bMEj5qE= 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=Tz0oFxEl; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=SE3ffNEA; arc=none smtp.client-ip=103.168.172.156 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="Tz0oFxEl"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="SE3ffNEA" Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfhigh.phl.internal (Postfix) with ESMTP id E55A1114018A; Fri, 10 Jan 2025 06:32:03 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-11.internal (MEProxy); Fri, 10 Jan 2025 06:32:03 -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=1736508723; x=1736595123; bh=EVyQC1Mf+thTfICtgwfvmYoAQe/VwfHxyVSrKhDhtyM=; b= Tz0oFxEl4/2l9Ry/sFK7rhPc4jdz5DC7fBhuQKOWx+EgejwejjPYeh6RVfUcpV91 meKl4gCTEqIKS4E2ltBN2PlsJNVt7T96y4tN1TdK/BjFl5zSiTx+EUdgZx0wTIE/ H9ldZix5Op2+8Lnhov5dZ/lsyCcEAc0ZHQ66r1sllL8IThY+pc1SeXYUTzHZKeLc kn29V+eXfrSHdKAi9ki2QqqhWJ6apYoOi97vV2ZaredNMu5+3dgoZPRdz27a39ef QyBH0wXFhgWU/kcbQtkP9xCU9eLZNnuqmA/cBl1VrqNEqKxINfuW+YmgakcXAWsy yKnnbX8CEu5ws7U+8cL8fA== 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=1736508723; x= 1736595123; bh=EVyQC1Mf+thTfICtgwfvmYoAQe/VwfHxyVSrKhDhtyM=; b=S E3ffNEAaFYEAo1YuOmPNP6CJNz9rixmze0LrIf+nXiItBcM3C298fOIghJbFNTyp TkchqUhyz1qnDEGWOhsXFWeWDU/u+W7fIGaAEBhBqodEL3R+kpMk5QsTYKIglmg5 OIkGpZqKXqz0M69LZbvghzM1Qr/Tz4gWatEcejYj7KxflqWDb1Ew5gm89735wojS UElPrU9S/zX9f5pKti0IAvmFmF9k/JAVSSR0pckh2qX2nnzoP8bCPWEqBzfqBJUg vDWAK7PQyfYwluPwWux8D0myrhVlLPpB2f5UZ6r62ZyIxG2mXA6KCAUWb3HU6KK5 ouTYC25wnChe9UxuefShg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudegkedgvdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertdertdej necuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrih hmqeenucggtffrrghtthgvrhhnpeffueeiudejvdekheeuvdekfeffiedvueelteekudeh jeetkeegvddugfdtgfeileenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehpshesphhkshdrihhmpdhnsggprhgtphhtthhopeegpdhmohguvgep shhmthhpohhuthdprhgtphhtthhopehpvghffhesphgvfhhfrdhnvghtpdhrtghpthhtoh epghhithesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehphhhilhhlihhp rdifohhougesughunhgvlhhmrdhorhhgrdhukhdprhgtphhtthhopehgihhtshhtvghrse hpohgsohigrdgtohhm X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 10 Jan 2025 06:32:02 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id cb0f295d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 10 Jan 2025 11:32:00 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 10 Jan 2025 12:31:57 +0100 Subject: [PATCH v4 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: <20250110-b4-pks-ci-fixes-v4-1-6e4613446080@pks.im> References: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im> In-Reply-To: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im> To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano , Phillip Wood 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 10 11:31:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13934321 Received: from fout-a1-smtp.messagingengine.com (fout-a1-smtp.messagingengine.com [103.168.172.144]) (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 67902204F65 for ; Fri, 10 Jan 2025 11:32:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.144 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736508727; cv=none; b=mdpCYMdyUGCbss95zqGCOruHsVuEY+nIrXh9qbU3HFwdesTkQSk9NNrek85JOK3v+5mUCbZHx4TOApGTClT5NlH9XVGSeO4vGA9vByDaKoorqTq/UZffKbsV1PemhIRKXTjExMUH0z5jVsyvYU9e/mlaED/5YNW0YS7jgYjKWfI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736508727; c=relaxed/simple; bh=ZN7OMJlvSyTzMrEamV9HtvuqN/8+XBdEBZLmcM4Ft9I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nUTaGSWQve7vE61twiHJ3jXd0KQQHCoc+84DnmxPwE/k02WASofxtYZzIuHe0cKrGgu3PmCmtDs4GRRYbwUmsrLZH9vUcYAET6W5BPcIsfxxfBXOGhfu/5CxSznJYWiXiMyvruDYi3YWymo5b8V83Fd/BcMH/kSWc4/EmXnpaVQ= 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=LCA9p8ZN; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=lfKLLWOp; arc=none smtp.client-ip=103.168.172.144 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="LCA9p8ZN"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="lfKLLWOp" Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfout.phl.internal (Postfix) with ESMTP id 3A75D1380C90; Fri, 10 Jan 2025 06:32:04 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-05.internal (MEProxy); Fri, 10 Jan 2025 06:32:04 -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=1736508724; x=1736595124; bh=MRlUeqXI/wsHvganAP+iFz/f0m7NV3cNdqeL9Cb+cuA=; b= LCA9p8ZN5I2I++MDPys8VRNuKvZR+xq+YpYEj4fy1gYM/3yfiXHNfF8EF4YosCtd Vwp0kvGKzH8DSuMvDvphTQcEc4nA7d5UN+n5sTr3LhYZi3iDNgO3EYLxSJNMX1A+ xOx56iDzFI3VqelGRHwP5zRtVVh4kxV8z7qDgxcuanYdZzvNH9mOKSQC0ZBHXzf1 ELVq1+LzHLZRe7ZIGVNsU4z4MwvLoMdnqREhfjRw3tfXfvB3StaM4tcL3XLAURhL aLBKem05CFczGNo52eiLYRx9OMm+zDI0AR75IvZyPZojrcZuZ0JMWvhCczhQNTlM j/6df7IfEW7y/U0iOXLXVA== 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=1736508724; x= 1736595124; bh=MRlUeqXI/wsHvganAP+iFz/f0m7NV3cNdqeL9Cb+cuA=; b=l fKLLWOpwZZWa6LTTDgDFev3XzSdQosqOy45Kqjr7pjgXZPZDQ2tCAazMbpqw7vQ4 HxT6oTZfBkyDUIf+2A2FGJvIORUS9FS5/Y/rDD1lgQPlPLk9vxoMEfIeaAwxIlCK b2ZdPY7T5m36FsF5dpxdhOLNPX/y0r0G4Y+xnOYlmZta2gntWQNdPMKdZNMKUdvM Amal0vSrepjoggAnbyM4GC5s60Ryd59eCuDXzYXyN3T75Iym8+1vrrtLPCCyI6Xi NYhw4tnBEa75ny7od628kxmQl9BgkVDnJNBXuj1UJSC20cHbTmYUL+gkrapASeC4 DlFNx2kreNzWzghrO1Zow== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudegkedgvdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertdertdej necuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrih hmqeenucggtffrrghtthgvrhhnpeffueeiudejvdekheeuvdekfeffiedvueelteekudeh jeetkeegvddugfdtgfeileenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehpshesphhkshdrihhmpdhnsggprhgtphhtthhopeegpdhmohguvgep shhmthhpohhuthdprhgtphhtthhopehgihhtsehvghgvrhdrkhgvrhhnvghlrdhorhhgpd hrtghpthhtohepphgvfhhfsehpvghffhdrnhgvthdprhgtphhtthhopehphhhilhhlihhp rdifohhougesughunhgvlhhmrdhorhhgrdhukhdprhgtphhtthhopehgihhtshhtvghrse hpohgsohigrdgtohhm X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 10 Jan 2025 06:32:02 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 4b998b8a (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 10 Jan 2025 11:32:01 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 10 Jan 2025 12:31:58 +0100 Subject: [PATCH v4 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: <20250110-b4-pks-ci-fixes-v4-2-6e4613446080@pks.im> References: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im> In-Reply-To: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im> To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano , Phillip Wood 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 a race between git-submodule(1) and grep(1): 1. git-submodule(1) (or its child process) writes the first X/S line we're trying to match. 2. grep(1) matches the line. 3a. grep(1) exits, closing the pipe. 3b. git-submodule(1) (or its child process) writes the rest of its lines. Steps 3a and 3b happen at the same time without any guarantees. If 3a happens first, we get SIGPIPE. Otherwise, we don't and the test fails. Fix the issue by generating a couple thousand nested submodules and matching on the first nested submodule. This ensures that the recursive git-submodule(1) process completely fills its stdout buffer, which makes subsequent writes block until the downstream consumer of the pipe either reads more or closes it. To verify that this works as expected one can apply the following patch to the preimage of this commit, which used to reliably trigger the race: diff --git a/t/t7422-submodule-output.sh b/t/t7422-submodule-output.sh index 3c5177cc30..df6001f8a0 100755 --- a/t/t7422-submodule-output.sh +++ b/t/t7422-submodule-output.sh @@ -202,7 +202,7 @@ test_expect_success !MINGW 'git submodule status --recursive propagates SIGPIPE' cd repo && GIT_ALLOW_PROTOCOL=file git submodule add "$(pwd)"/../submodule && { git submodule status --recursive 2>err; echo $?>status; } | - grep -q recursive-submodule-path-1 && + { sleep 1 && grep -q recursive-submodule-path-1 && sleep 1; } && test_must_be_empty err && test_match_signal 13 "$(cat status)" ) With the pipe-stuffing workaround the test runs successfully. Helped-by: Jeff King Signed-off-by: Patrick Steinhardt --- t/t7422-submodule-output.sh | 43 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/t/t7422-submodule-output.sh b/t/t7422-submodule-output.sh index f21e9203678b94701281d5339ae8bfe53d5de0ed..023a5cbdc44bac2389fca45cf7017750627c4ce9 100755 --- a/t/t7422-submodule-output.sh +++ b/t/t7422-submodule-output.sh @@ -167,10 +167,45 @@ 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_must_be_empty err && - test_match_signal 13 "$(cat status)" + # The test setup is somewhat involved because triggering a SIGPIPE is + # racy with buffered pipes. To avoid the raciness we thus need to make + # sure that the subprocess in question fills the buffers completely, + # which requires a couple thousand submodules in total. + test_when_finished "rm -rf submodule repo" && + git init submodule && + ( + cd submodule && + test_commit initial && + + COMMIT=$(git rev-parse HEAD) && + for i in $(test_seq 2000) + do + printf "[submodule \"sm-$i\"]\npath = recursive-submodule-path-$i\n" "$i" || + return 1 + done >gitmodules && + BLOB=$(git hash-object -w --stdin tree && + for i in $(test_seq 2000) + do + printf "160000 commit $COMMIT\trecursive-submodule-path-%d\n" "$i" || + return 1 + done >>tree && + TREE=$(git mktree err; echo $?>status; } | + grep -q recursive-submodule-path-1 && + test_must_be_empty err && + test_match_signal 13 "$(cat status)" + ) ' test_done From patchwork Fri Jan 10 11:31:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13934323 Received: from fhigh-a5-smtp.messagingengine.com (fhigh-a5-smtp.messagingengine.com [103.168.172.156]) (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 7D78C20B7ED for ; Fri, 10 Jan 2025 11:32:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.156 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736508729; cv=none; b=nJBF5OK0RwlbBuy/EGISJxFujgN0rmqFoxY3SNy7k4ay8hElVJo5C1PzfJ/FKP7j1ViwAsqEb5QTKrlLN624CwjXVEjlJfxEQxCrAGYYKB2gz8Q5Ctuo0Eo3Bb0BafV+UeNOcYGZ2PoBTkpI7T8VfphuZqOEUWPQSVMv8IuAy2E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736508729; c=relaxed/simple; bh=rcOn6QQAi9ksQJ7iYZ7f+Wha7jsDrX54VVSXwiLCIOo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SROYayHTmdE6mo13qVGWh4VGsaDV2B26Swi9fRj7WtLugorqLgxcX59mVk3G6jiHO1XA+9QjE+N2T33tILP6tFHXM/+wOKH57Pua/MTipJfRiDlwYTB7qzQ1uynpKrL/z4Z0ecw/xgSb5E8jRi9AFK5lYFDkfOgs2XX0TweA0U0= 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=mPTh/sXW; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=oLTZwoPo; arc=none smtp.client-ip=103.168.172.156 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="mPTh/sXW"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="oLTZwoPo" Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailfhigh.phl.internal (Postfix) with ESMTP id 69AE511401C7; Fri, 10 Jan 2025 06:32:05 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-04.internal (MEProxy); Fri, 10 Jan 2025 06:32:05 -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=1736508725; x=1736595125; bh=oU81E4vjU9mWIYi+R0YGvjIz6GzOlima36++Vwa/mYA=; b= mPTh/sXW5/ElOmBr9w/xEYnae04R71+9KwJ3GT5RvuermJgRDsisRvtw1frZBO6/ aN9gXyX55NqpM7ucJDR14ccUIzg7HrPR37p7YkDjCXjJiDcnZ9hLQkFkjfiD5zg7 aNr2RKEILWeGWnDlLd2q4Or+OXIFlfUUlP78X2eD1MaX1bh+Ptw2mGnbvaLF2qbZ T/kpiPaL2JSQRDMfZFZrh+sf7HDe5o9/OVEj3/WZSbBlq6/P38lyI0BBQYwRnwCR CQ4V8BjBvijaF+Zglk3u9mZ+T+EELAtP/0Qu3np76jACLxE9HkYC/NmA7+qTwx1w YgkotwVYWHAnn4zvPOtinw== 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=1736508725; x= 1736595125; bh=oU81E4vjU9mWIYi+R0YGvjIz6GzOlima36++Vwa/mYA=; b=o LTZwoPo4PZhQVvvCo9yHkeZK4vujuzB8DSFGpVgalnVFW0chrUKzcvUmFpMdRYr6 CpJWogRYbfOMCYfWGJysp58TQw/3MiX6nbBxY95md2rpuEVRAWSt2DT1mrsOTlUI VoVlYGL9/JGVTRLCsP/ke+OAgxOWfAGXc28pIFZ6w8VHZfNEVrff8vENGKlkThnw V+qjGnjI/9anQy7YtwbKBWUynhKf//DsQtI/aUkdErMYdax/Pcha9nUzK6FkuZ7I ch4C9sEhl6H93CLcW2POL/AECzQLo1NG7f7Tmg7WKtiRjgsrKCeBRMMbis5HLPH5 cg0YR2Z69cG/jtaGGn0Eg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudegkedgvdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertdertdej necuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrih hmqeenucggtffrrghtthgvrhhnpeffueeiudejvdekheeuvdekfeffiedvueelteekudeh jeetkeegvddugfdtgfeileenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehpshesphhkshdrihhmpdhnsggprhgtphhtthhopeegpdhmohguvgep shhmthhpohhuthdprhgtphhtthhopehpvghffhesphgvfhhfrdhnvghtpdhrtghpthhtoh epghhithesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehgihhtshhtvghr sehpohgsohigrdgtohhmpdhrtghpthhtohepphhhihhllhhiphdrfihoohguseguuhhnvg hlmhdrohhrghdruhhk X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 10 Jan 2025 06:32:04 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id d9d03fa3 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 10 Jan 2025 11:32:02 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 10 Jan 2025 12:31:59 +0100 Subject: [PATCH v4 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: <20250110-b4-pks-ci-fixes-v4-3-6e4613446080@pks.im> References: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im> In-Reply-To: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im> To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano , Phillip Wood 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 10 11:32:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13934322 Received: from fout-a1-smtp.messagingengine.com (fout-a1-smtp.messagingengine.com [103.168.172.144]) (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 76C8120ADFF for ; Fri, 10 Jan 2025 11:32:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.144 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736508728; cv=none; b=TIhOraiLZFZJMinkjilgHTRdHaFKI8wH3oQb7OzRcOEwodeFYGlbvuLAUcOWaMepcebyR6UFrgFJ2QkpBY0WtLqzHfRcqaRSbxu1Q7DYQpRZFyr0dORD+h6h3lsJb/nbsVMaYnv0DiEr91P5Rry9At5Ae+CK1XvARGgEixuq/6M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736508728; c=relaxed/simple; bh=kWlnfK7pp07EH/cLMWcarrilgu0+ceR0uSlScefDUcI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sAq/SQHMskFrTAV2NYU3yR0Dl8yYS/ugOo8YPLtQrYE/VahSblJHqtOvB8C+37iKh5s1e0YGPZKJRhC43hFVo8jwW3oEnezTQ+nAFgPjP7CF1gL6EaIf+qCaWLlFm1Dv32jYKWHu9Tys2IKj++szjQRvmMoWIkrsbC+cU65h08Q= 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=SwiGF+YF; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=Ef+9JcTj; arc=none smtp.client-ip=103.168.172.144 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="SwiGF+YF"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="Ef+9JcTj" Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfout.phl.internal (Postfix) with ESMTP id 918AD1380C92; Fri, 10 Jan 2025 06:32:05 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-12.internal (MEProxy); Fri, 10 Jan 2025 06:32:05 -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=1736508725; x=1736595125; bh=bQT56Ppy/NuGzR/tjTxvkhfeMCjU/x5QMBohq7BQdA0=; b= SwiGF+YF5hp2QDC61rOP9E2I8sezmsghWbyZDD7tqmZXqy4IM3KSN/zu7YuTdo+F cWNkQzMwTkypcNmVXbrUsR4E3bEdXr0+yvSAPgGqRABOywNqfcbQzqLXEc6qiCDV 54p+xjolMnZQGYPc2WaMNZhFOSpHklXXEVsmYsoWwGM6AJDnLzUsu7/NhCYiL4XA 5i9dSSYwlRlGF6ZGiZEwDBdGRMDfScPNJfE9mXJ6CS/yY3OzQAChknN7QjPQD+PD iJn1vbvENMuezASt1OcZyPtYdVeIkW4rPZfuPYgL1l+jblSlkgMayEhIByi987uH jj6RHCGM9TRwx8bGsOq8Pw== 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=1736508725; x= 1736595125; bh=bQT56Ppy/NuGzR/tjTxvkhfeMCjU/x5QMBohq7BQdA0=; b=E f+9JcTjms9ZQCYtxviQtjGxjvA02JfU5CpGkJTsyjPNxEMk7tZjmZdFj5bXo6wG8 2/7ZOohsS1s+DQDnpzDejAQb7J+ymkdkCpyKLNbNIkdiiYS3pTEGy5u+7aG32eEN ecgOyNADmCH2oH8IpOQXuiWwrRpT+ak3mrmQtnutg+THB/xqU013a53G/JTW46CF wDgNr1tBp0dkQd5Oot2oJWCEKx5sXfOXM33Wyc6KUnDG5tnscxrJCIj59iZvXk0A G7pebcQRG+6NVTD4jhRVzgosHagDV3ixX+I8oQ73HZFTjGfUwf1AUlgNTtqjL/Me XgHAMsndLLDtzD7f13QNw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudegkedgvdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertdertdej necuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrih hmqeenucggtffrrghtthgvrhhnpeekvdeufedujefhudehudekfeekvedtvdduvdefvefh ffeuvddtkeffvddttedtkeenucffohhmrghinhepkhgvrhhnvghlrdhorhhgpdhvvggtth horhdrtggtnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhho mhepphhssehpkhhsrdhimhdpnhgspghrtghpthhtohepgedpmhhouggvpehsmhhtphhouh htpdhrtghpthhtohepphgvfhhfsehpvghffhdrnhgvthdprhgtphhtthhopehgihhtsehv ghgvrhdrkhgvrhhnvghlrdhorhhgpdhrtghpthhtohepghhithhsthgvrhesphhosghogi drtghomhdprhgtphhtthhopehphhhilhhlihhprdifohhougesughunhgvlhhmrdhorhhg rdhukh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 10 Jan 2025 06:32:04 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 931e8a88 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 10 Jan 2025 11:32:03 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 10 Jan 2025 12:32:00 +0100 Subject: [PATCH v4 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: <20250110-b4-pks-ci-fixes-v4-4-6e4613446080@pks.im> References: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im> In-Reply-To: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im> To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano , Phillip Wood 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 do not have any significant downsides to the best of my knowledge: - They aren't significantly slower to start up. A quick comparison by Peff shows that the difference is mostly lost in the noise: job | old | new --------------------|------|------ linux-TEST-vars 11m30s 10m54s linux-asan-ubsan 30m26s 31m14s linux-gcc 9m47s 10m6s linux-gcc-default 9m47s 9m41s linux-leaks 25m50s 25m21s linux-meson 10m36s 10m41s linux-reftable 10m25s 10m23s linux-reftable-leaks 27m18s 27m28s linux-sha256 9m54s 10m31s Some jobs are a bit faster, some are a bit slower, but there does not seem to be any significant change. - Containerized jobs run as root, which keeps a couple of tests from running. This has been addressed in the preceding commit though, where we now use setpriv(1) to run tests as a separate user. - GitHub injects a Node binary into containerized jobs, which is dynamically linked. This has led to some issues in the past [1], but only for our 32 bit jobs. The issues have since been resolved. Overall there seem to be no downsides, but the upside is that we have more control over the exact image that these jobs use. Convert the Linux jobs accordingly. [1]: https://lore.kernel.org/git/20240912094841.GD589828@coredump.intra.peff.net/ 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 10 11:32:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13934324 Received: from fout-a1-smtp.messagingengine.com (fout-a1-smtp.messagingengine.com [103.168.172.144]) (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 A05C4202F87 for ; Fri, 10 Jan 2025 11:32:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.144 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736508729; cv=none; b=Fu0CuBaQxBroQmHwQL2sXHgZpXfZgyoCMGdtVQhz2tdYgaYYDT2HoYDc4Zz+5G4WNhUdUQZ3B8NF5IMX3Uim0Nny3hk1Iz9+2m0oA23g8bk4TQNHooaQJS+FzaTdDAJgFHorURFjHtatJxlERvIJDV8GOdrPUAKcUaR3j62pdOo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736508729; c=relaxed/simple; bh=8rlLczoTTWoj4OfZLOSj78aId16pZAEk+oyhts/qWoA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YZiCqqHJ6GC1etEHBv5aYdGoIu76ZFA2FEdNPWjj23mLQT2BGbP+O71GHlwS5GBt6NFL8qX3hvRxxe4hqsCi+pDlZSb8C8Q6eEWoqGiTB54vpHA3A4jiKwtYleR7WjDiH3bUFsKCpXwDekhnUMaZR4+adFDmSjdC6DNpRBNQrOc= 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=ffpCGGGK; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=AXwqVhqm; arc=none smtp.client-ip=103.168.172.144 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="ffpCGGGK"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="AXwqVhqm" Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfout.phl.internal (Postfix) with ESMTP id B77001380C91; Fri, 10 Jan 2025 06:32:06 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-01.internal (MEProxy); Fri, 10 Jan 2025 06:32:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1736508726; x=1736595126; bh=XnNqMIj+w8pabGILx1bK+vMV+1qRPCWkYC1QSOXaGUE=; b= ffpCGGGKf2x1GjvUBkAI73J3MKf21G9Pd/WTiri/mOSGfRos8bIOmuqot4UvRwE1 RlZEeDk+10pcmW+8B4T9xjdAhuZGkDn6O24MMYpW4UZ16QMLFwUgoBgNoi3zO/Rj RA58ZQ0FPPlse6/G9JWg7KJrTk7QRVGDNG91xoAImHTkNFogNwcaCk9Fs3VMVjaN +YcmCFQ8GHzGISMh+MFBtFbzf3TLbnM1J0X1V/ITbGbILYG1WEJm9wPYjfcYCP+7 pQsHChK/NycVHkB8a49IYt6dzLvy5zJKZhcQvTS4gJGGDzTiy79Tuj5kLDqk6aXz Nqdk30GUyOmcx8oSeUW3qQ== 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=1736508726; x= 1736595126; bh=XnNqMIj+w8pabGILx1bK+vMV+1qRPCWkYC1QSOXaGUE=; b=A XwqVhqmg5uB3bw1ATI2kVTWNXuvK2PoiUPPB6g+R34MTuf4wjKHjqmJb5yQAF8UV +CGAj/keNlJFXr9wSUrpqHIE7CsXtUKS0euCkQ7u8WDB8t0kZTDCTKiGRMhnsbv3 0XssniakZ6uOByY7kNhO3cPjqtJyUvceJEGYMCVjpfkPyrhZkN4jQqWlzwUdq1Ka dTBNmUlsP4oXicsbYiW/6ZqNSFdCAXHOyVR2NhFM9RYobdmby3nl3ey8vgyg9s9b 3WWrDjqOHU/qn0zJ8jvQjO9pbG5EN1zbU/8kEi/5dvQFaUcIhuPIYuW2P4WXz1it dOgSypuUfsGAVKDwm8mkg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudegkedgvdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertdertdej necuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrih hmqeenucggtffrrghtthgvrhhnpeeggefglefgkeehvdegffelffekkeehudfffedvheeg ieegudehudekleeivedtgfenucffohhmrghinhepvhgvtghtohhrrdgttgenucevlhhush htvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehpshesphhkshdrihhm pdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehgih htshhtvghrsehpohgsohigrdgtohhmpdhrtghpthhtohepghhithesvhhgvghrrdhkvghr nhgvlhdrohhrghdprhgtphhtthhopehphhhilhhlihhprdifohhougesughunhgvlhhmrd horhhgrdhukhdprhgtphhtthhopehpvghffhesphgvfhhfrdhnvght X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 10 Jan 2025 06:32:05 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 29654599 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 10 Jan 2025 11:32:04 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 10 Jan 2025 12:32:01 +0100 Subject: [PATCH v4 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: <20250110-b4-pks-ci-fixes-v4-5-6e4613446080@pks.im> References: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im> In-Reply-To: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im> To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano , Phillip Wood 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, 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 10 11:32:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13934325 Received: from fhigh-a5-smtp.messagingengine.com (fhigh-a5-smtp.messagingengine.com [103.168.172.156]) (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 C65C7207A33 for ; Fri, 10 Jan 2025 11:32:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.156 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736508729; cv=none; b=mP8Ho52R92nq8dXp9dAYT4b4sF+m0lbgJQdMB2g0/Hyj6A4NHnOAyJSxi8Msb7Xd7qFJH98MRChfl4nP6y4aNSrRNVQnDexluwGGAfkgiDPdbsGBitnwd1/PZgOzv6aPWYvV5vKx1ImxjysY9gVAj1I72ArpaoPm2X4w10yDiSE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736508729; c=relaxed/simple; bh=JFHHEbz2oE7VVQdLzJs4YiqTPVPDUg8hU0JfVGuRSpY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Hh48J9P2FslU9wG7D869VqPkYceM9lBHJgnxgH05YEn6VsALJaTsmLFgqR9orDUW3/y1PreZvcxxKwbV29heccl3PQAH6wSzZnXCwXbxA/tacr2gn7GrOmYFxCn8Kh5lOXTnz3cUVzByE2NjkJ+FwQANxIHpSicqSWl07vOYzMA= 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=E9a6aHIb; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=Sj41Pj8z; arc=none smtp.client-ip=103.168.172.156 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="E9a6aHIb"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="Sj41Pj8z" Received: from phl-compute-09.internal (phl-compute-09.phl.internal [10.202.2.49]) by mailfhigh.phl.internal (Postfix) with ESMTP id CED8D1140106; Fri, 10 Jan 2025 06:32:06 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-09.internal (MEProxy); Fri, 10 Jan 2025 06:32:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1736508726; x=1736595126; bh=rjcCvr+RH/6kX9YTo9SuZQ3/JoBF3nnvWaNwFRvlZaI=; b= E9a6aHIbAY6vGV55lnMXQJpshz7LQozssIsiKh3G6CPs4HXVYmf1PhOUA65b4ozW /aonR+BrhK6qTHC/doa+3lVE59qyyvxoeTLQ13/WU3bCT5Jd1urpS+gWuQr7r03r LRXEDP1knZYXN+s+ccoV5i4bHAIik/TYtiFlHiYRPee/dbHthMNgzFWQLco12kiV Xn/TIK4HH/5w/UAbUnucHsWlUuVND0tI+6QCaMvueBHy8S+fonfHNbVW6KIqX6r9 JEmlxO6bxWop7bqCOIUkUhWQ/Bno6OyaFgbn23soFYpelxLdr8q+g8GBrq8o14d1 LScABUWYwaSZ85yJzOZfhQ== 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=1736508726; x= 1736595126; bh=rjcCvr+RH/6kX9YTo9SuZQ3/JoBF3nnvWaNwFRvlZaI=; b=S j41Pj8zd0kRHpUZGw1phdUGJu20oEk18SvQ7O7BXB5BjVZM5G1SyqM+ejoiy1bwn UroW1TUkZqB7rA+h657Y8+pSbc+WDFTKssscEWRnyLFMe3/OL7ISviteB7yIoec1 8Gebxep1+N/5cBgMOJmhQbzbZbCN1mR8BUHe6KWWfHowjmxY2p0NVerYXGFWWvgl wMokMv9AmA52mivry1pyuvE/nQTMElykCnFikKlHlr4K16MEI4FDEb31Wmxi3549 hL5bmFlEqQasNoe0pxp10RoYSZJABRmfHYnGlArxurongV4WLrqwukY3shaqP2X5 vilXiBygPxQfjr9pmU0Zw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudegkedgvdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertdertdej necuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrih hmqeenucggtffrrghtthgvrhhnpeffueeiudejvdekheeuvdekfeffiedvueelteekudeh jeetkeegvddugfdtgfeileenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehpshesphhkshdrihhmpdhnsggprhgtphhtthhopeegpdhmohguvgep shhmthhpohhuthdprhgtphhtthhopehgihhtshhtvghrsehpohgsohigrdgtohhmpdhrtg hpthhtohepphgvfhhfsehpvghffhdrnhgvthdprhgtphhtthhopehphhhilhhlihhprdif ohhougesughunhgvlhhmrdhorhhgrdhukhdprhgtphhtthhopehgihhtsehvghgvrhdrkh gvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 10 Jan 2025 06:32:05 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 1f533bbc (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 10 Jan 2025 11:32:05 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 10 Jan 2025 12:32:02 +0100 Subject: [PATCH v4 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: <20250110-b4-pks-ci-fixes-v4-6-6e4613446080@pks.im> References: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im> In-Reply-To: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im> To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano , Phillip Wood 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 10 11:32:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13934326 Received: from fhigh-a5-smtp.messagingengine.com (fhigh-a5-smtp.messagingengine.com [103.168.172.156]) (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 DDCC51714AC for ; Fri, 10 Jan 2025 11:32:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.156 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736508730; cv=none; b=fBgS7pRneZK5YJMt+DK6/wJQKkhbZ9fH06/VRC/VSo0XK9p3U80UsoYN6eM6VI6f5pIJTxZAchfxO0++z2MajEIUj77FaaQsUl82++qXKJafW5VnWWqQoWwBZ9ARZMszgzFNexPtTi9ji5k+oggQIlXXcmCMePYZQh4V0ujFSbc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736508730; c=relaxed/simple; bh=E92e8c5L6odZSBnMNkLTL5dfQ2c1V4fRGOQFonxGVH8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=K0Pk7n1IV3RQGMWkeqZceyryxAk9d0ocAk/JPRyXV4B/kW8ldcUYTnyIJdEJpDFKF+okZZ9aXpAE9mU0QUNBWzEAeDy6kmb3CgwxL4ABFOE7Hq19a58bRvnuvVS8wYDi4SwrCnAyVhfDPLHgE+V710ff6C3BUx8UieqSO7BX0o4= 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=vdbGgJZx; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=bj2eo7sx; arc=none smtp.client-ip=103.168.172.156 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="vdbGgJZx"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="bj2eo7sx" Received: from phl-compute-08.internal (phl-compute-08.phl.internal [10.202.2.48]) by mailfhigh.phl.internal (Postfix) with ESMTP id EF7B911401D9; Fri, 10 Jan 2025 06:32:07 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-08.internal (MEProxy); Fri, 10 Jan 2025 06:32: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=1736508727; x=1736595127; bh=xq3etOtcJkx79x1HGzYdICpQFtUlynF8xfRcB845rBg=; b= vdbGgJZxQKsc/o8PV6mcyLD4wF4sfbQoGHUmy0ilGoqizcGriRRFY8nZFGz2g4L2 zRM8LBHihOPDgpzgQqx9vQnjzUoffQRUkn9vxjfdTMchSZgA45NAaMyoTyU8RELk ynMWCObSoR2DWa+4uyrf0lLBUxdKB+LVeL/Y44mule6sJTFre14QaW+rj5rf1pNk y5zfviVp5dMi2bqdpFzzDrmDqT1/2bEsHJMD+vfC23a0MS/XNtaolyyR59HkrqiN ma35yTUEc8dH2UIWITs7FF/l2E7Sme7zqnLBT5DEd6GwP1XQP1igIAqMMIl0SR8P 2IFVTluPtlHgSVriNM/qbg== 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=1736508727; x= 1736595127; bh=xq3etOtcJkx79x1HGzYdICpQFtUlynF8xfRcB845rBg=; b=b j2eo7sxKBGiOyuG5VSyO4QsvgFm8IupzyJfO1SQz+EKOljd8x72bzI+cim40zY1A 1wPo5f4zHWYTN0n8/jvhlk/huBwYgNM9+fxDLRgKZmuHhcQC9zxKEovaGvP7sn1T VGLN0WrpHu2ZroIiqfM0cmLSipcrfiIELRIFoXPjVKAzXNnx94y+L9FhDEZAjjgZ tVNF+VC5vSL5NmSsRNl44fy7p/GPPMfGyRi4oXzuPMXyBnYDP0j4rwwvEKOMit2j 8Erdrr+GkghwKeyuZZsLH1RNKMLZU2r/1qdFf1qMK9sddwC7FGUDWDgaNmUvcWRv TfXJc0oXfm83oU7KpJwQQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudegkedgvdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertdertdej necuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrih hmqeenucggtffrrghtthgvrhhnpeffueeiudejvdekheeuvdekfeffiedvueelteekudeh jeetkeegvddugfdtgfeileenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehpshesphhkshdrihhmpdhnsggprhgtphhtthhopeegpdhmohguvgep shhmthhpohhuthdprhgtphhtthhopehgihhtshhtvghrsehpohgsohigrdgtohhmpdhrtg hpthhtohepphgvfhhfsehpvghffhdrnhgvthdprhgtphhtthhopehgihhtsehvghgvrhdr khgvrhhnvghlrdhorhhgpdhrtghpthhtohepphhhihhllhhiphdrfihoohguseguuhhnvg hlmhdrohhrghdruhhk X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 10 Jan 2025 06:32:06 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 90535c23 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 10 Jan 2025 11:32:06 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 10 Jan 2025 12:32:03 +0100 Subject: [PATCH v4 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: <20250110-b4-pks-ci-fixes-v4-7-6e4613446080@pks.im> References: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im> In-Reply-To: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im> To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano , Phillip Wood 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 10 11:32:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13934327 Received: from fhigh-a5-smtp.messagingengine.com (fhigh-a5-smtp.messagingengine.com [103.168.172.156]) (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 0ADCB20C488 for ; Fri, 10 Jan 2025 11:32:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.156 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736508731; cv=none; b=jK6wyOxP6DypwCmVhfWJlhu3xwpklolMvUssA9f/3T7afLvNhwN9ub2IBwkkfvYbQgvduhWUI48mM2YhTNO9Nl3PL9dKIEW0mWVGsfjt8oMnhGIfY2I/sQspr4wVI5AEqyh9+4XqSwTjmXJpXdpjXXjGVy6sjHfIPyIulQerGGc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736508731; c=relaxed/simple; bh=xy+HIa2KxluQx3jvqNX1uQVbE9H94R/Q7PYT+kGKTBk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=V436xfUtHFnD8dtbkd+cZptPr82Ugx8GvGmI9YAQuyh0FQnIoE9BXmYQguMT/ucocUoIr/2SHEgdu9oIJ8qBvMWPFEF/MLldEyqAe50JSgJwavmwQSmJ0cN6S71r3MFShzHaSs/U9R1qAL931YrhVGVYXxr8MZf8Tu+QBHlnX3c= 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=ISZ482Zf; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=Yoa4jJrL; arc=none smtp.client-ip=103.168.172.156 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="ISZ482Zf"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="Yoa4jJrL" Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfhigh.phl.internal (Postfix) with ESMTP id 2362511401EC; Fri, 10 Jan 2025 06:32:09 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-01.internal (MEProxy); Fri, 10 Jan 2025 06:32: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=1736508729; x=1736595129; bh=pXHspbm0cPcFnCW40CkUnbHewPPdbe9fSkR1CZi11wE=; b= ISZ482ZfjXR1x5nBIRvuaJG5XAwklIN0nS4QvMzfovs1ACaYih+ZqHzJsL4LsSos n0LLxF73/KUd6y6C6lpyrABePIvLU3AaD7Wdw5bKY6InuRTyfyiTt4eY/heeoieP FNF/3JwmWWkQHDDZFDUFWoYqesZlhApEDIhAbzzAO3OhDptCTHF0ei0Su2OrL6dD 3Mx4QbpCuW3eaTOTYXtwR1T66d02e8EdaFiJq4vGg5G8rzEMZw8HIpBQmjN5MEC4 iTn7Dej+wUzqCRHFDYzhqRRGPmf/haxz/3+RxA+VCP0WmZZNZzsFPVP0KmnDY0GW chr2GYfZcIGG5TGLoIGLXw== 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=1736508729; x= 1736595129; bh=pXHspbm0cPcFnCW40CkUnbHewPPdbe9fSkR1CZi11wE=; b=Y oa4jJrLLJ0qcBwROopqxhYSV9gGfSHIE6grBnMmmHQsbn1PKexZETAToWINodlkr dYRgvbBvSsEwtSBS4X4a6G3ONlTmdTzJTJUcK0lWdPEsUIPbEQEWbm4ENkDq1rwZ rGheGbufTu+Kjch1oyxR5aLHTnrKwVooOqE0KhRNMHcuF6/XYDd0Xq/9FXfJ94Yp TfNpyABctE0arsJ7yFH65izcUkIpwp8A+iVbjxYnrn0gJb3gCrdCoC2vBU70ToRV tNLgaBNOgOqqeEt/lIBC+T0Ge1lgUqTEtS56cB/P+u1Sgy1ejBsZYZpj0lApjZUs I0XkZlf5Gg2VRzSuFk9CA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudegkedgvdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertdertdej necuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrih hmqeenucggtffrrghtthgvrhhnpeffueeiudejvdekheeuvdekfeffiedvueelteekudeh jeetkeegvddugfdtgfeileenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehpshesphhkshdrihhmpdhnsggprhgtphhtthhopeegpdhmohguvgep shhmthhpohhuthdprhgtphhtthhopehgihhtshhtvghrsehpohgsohigrdgtohhmpdhrtg hpthhtohepphhhihhllhhiphdrfihoohguseguuhhnvghlmhdrohhrghdruhhkpdhrtghp thhtohepghhithesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehpvghffh esphgvfhhfrdhnvght X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 10 Jan 2025 06:32:08 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id c720ede0 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 10 Jan 2025 11:32:07 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 10 Jan 2025 12:32:04 +0100 Subject: [PATCH v4 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: <20250110-b4-pks-ci-fixes-v4-8-6e4613446080@pks.im> References: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im> In-Reply-To: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im> To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano , Phillip Wood 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 10 11:32:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13934328 Received: from fhigh-a5-smtp.messagingengine.com (fhigh-a5-smtp.messagingengine.com [103.168.172.156]) (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 5328B202F87 for ; Fri, 10 Jan 2025 11:32:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.156 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736508732; cv=none; b=IYn/eu8QeCeoBE9ad6ZxIY9lfrfQSrhZOVO6bUVq/ZMo7tcPqHFm6jFSwK3nGGeuK1HuDXP2RGcwWfmSPFFKM2ycF44E26Jb1EhGIYgRDFlOWHz9edKSDkR02oLhUVwv8bAuM81Aorg2uyTVc0iCNGIQtxZHShNHs9rfdI+Fn0c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736508732; c=relaxed/simple; bh=Z9v7FV9val1Dknrq6cZNW1IERaZaME72DIqAuCdQFU4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FHbY8uPZjTKCoOuxeRF0NzsRWnhiSD8kAQCKCQU5CSXUbh/99E5vlcRayHeAjqKenq9ucmITvDKvnMua+Z76lWu7NRoy9cI2RPcsX5WalbWjDeje5wPGdsbaHVGf6n8CSXhbYvK+MfAO6uPAvPa0IoCVArtEB+WOjzfgFT4iGmk= 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=r8pJMwzh; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=IFn3bGa1; arc=none smtp.client-ip=103.168.172.156 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="r8pJMwzh"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="IFn3bGa1" Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfhigh.phl.internal (Postfix) with ESMTP id 6286211401E4; Fri, 10 Jan 2025 06:32:10 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-01.internal (MEProxy); Fri, 10 Jan 2025 06:32:10 -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=1736508730; x=1736595130; bh=smcIhZGUfoj6gzt8JD6fDtkOhmUKxgwmO3AlxpEGoB0=; b= r8pJMwzhNnSb4oYaIFjwPDjfqXY0HHSG2lO8mEDEeeicS7X6qhDppWHGl593yRDK P4bmH2axA+NgYdcAQrNc5tKE9YXm4KWJoRqZqK2ka+96IZDKw6V8Bp9tDbmiQU+U IgyhV9yILM8ndUY3C0M4GQXcNs53dIClqPsqdeOT4l7urbKnVcQMunqN74oC/fKh wcJgT7qIGoK8yg7HVrGQh5p4THriS3WuWoxJrfUS/nbcF5Zc+EGsiQgJYxjMO8ks f57nauyxEhy5TmumweheRJzW4v6gjSlALCgMaI4diSp4294HHj7sT9WJL17eNF2G DTSMIOmyIPI/jdOE36LQ4A== 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=1736508730; x= 1736595130; bh=smcIhZGUfoj6gzt8JD6fDtkOhmUKxgwmO3AlxpEGoB0=; b=I Fn3bGa1/HIb6JfXCdkwYsC62pOrPl6EFNYaL4bCm4eKxzmDLBFfaJQTdFbO3+eI0 Hx1/FtoD4ISyAIJpkiK9h9A6w76K8hk3KtWG7kRJPrL0BFnCQqmtiPRTVKzYgu8m 91aEpZhilVcnoomvsdeJSLt4kIR+MvFKqwqD3HTa10osWzgHJorNusqYFzMwV86E EgzZQSLhZrkWkpGhxQJkqOxx8BvacDNClxJ/VyFY8l62XroNNRe4NHAsO6vWwol9 dQtRk6SJt5L8Rya+kc7sH1qFoC3u8xA4UF6wdb/k42+Qc3VGJo2JooxAZIl50B8U sGhUey1rACUuNDsEELxIA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudegkedgvdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertdertdej necuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrih hmqeenucggtffrrghtthgvrhhnpeffueeiudejvdekheeuvdekfeffiedvueelteekudeh jeetkeegvddugfdtgfeileenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehpshesphhkshdrihhmpdhnsggprhgtphhtthhopeegpdhmohguvgep shhmthhpohhuthdprhgtphhtthhopehgihhtshhtvghrsehpohgsohigrdgtohhmpdhrtg hpthhtohepphgvfhhfsehpvghffhdrnhgvthdprhgtphhtthhopehgihhtsehvghgvrhdr khgvrhhnvghlrdhorhhgpdhrtghpthhtohepphhhihhllhhiphdrfihoohguseguuhhnvg hlmhdrohhrghdruhhk X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 10 Jan 2025 06:32:09 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 98ac55ea (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 10 Jan 2025 11:32:08 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 10 Jan 2025 12:32:05 +0100 Subject: [PATCH v4 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: <20250110-b4-pks-ci-fixes-v4-9-6e4613446080@pks.im> References: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im> In-Reply-To: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im> To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano , Phillip Wood 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 10 11:32:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13934329 Received: from fhigh-a5-smtp.messagingengine.com (fhigh-a5-smtp.messagingengine.com [103.168.172.156]) (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 8876120D4E9 for ; Fri, 10 Jan 2025 11:32:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.156 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736508735; cv=none; b=eCTCQYc2hcw238UgvqmRQDeYbRwshYA7HtQ9pUzxqIcEOGNLhMcUEw5zeDZaUsczg97ZzAcr1vACX6nDQS/a/fu9hMZk/2KwRXKMrLVqjZY/CpU3lZPg+oKGluGusJBBTdVb0s6LUMS8gil5lBG0qLWI5OVcO61emDiJVjyuxiE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736508735; c=relaxed/simple; bh=ghWrse/FhTV33X00xHvgmCjBFlWzyEB6KSCRmTDQKwc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rWD0vxD3o2rdhOYFU1We968Hb0i1wq6DG2R0gMIgYjKvfxeSH6lpPH3XuNRD8idjNCveEaNpinlqcLngkP1voX0E6/JMdndCPpZSbiZJket4SOHNdQMzARay6elRW1n8tsQZcugfABWVV755TGPJMv046g8e4oN0gTftw2TiAP4= 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=XSoQzBth; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=bAIlRbxz; arc=none smtp.client-ip=103.168.172.156 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="XSoQzBth"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="bAIlRbxz" Received: from phl-compute-02.internal (phl-compute-02.phl.internal [10.202.2.42]) by mailfhigh.phl.internal (Postfix) with ESMTP id A26A511401A1; Fri, 10 Jan 2025 06:32:11 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-02.internal (MEProxy); Fri, 10 Jan 2025 06:32:11 -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=1736508731; x=1736595131; bh=UNnGfgGf7tZwpczUFQXyQa9fnyCCAfZMw9aJVyVxYRQ=; b= XSoQzBth40SGe4pFq+H2px1fcrYLGepqJINouiwC5HFm0N41iwn+a0VRs1ewsMKY +/df9IiCZXsL7LEvND0fdWbQeqcW4ZVCvvQZceJ/6U2cBfk1KC9yLa+Xqr+RRYF8 u2bm4a8IhnSZehR27QgGFT+Fu9OP4N9Qe7/x9f9MnptoBVNFXYTLfeHzIVTuvmy0 rXLBSSkW+OIyWwKvz1hTViJi33mY+N7HbFBk7o3VbBMx861LjU7oM7dHvYJme2SB CPcD3d6AqRxyuYZfX6YslcWm762K6Q/fT4DI2PpTXAiltUTR/XVjREqwO4slGSz1 Q3r3HZi14ym5n+lX35oXpA== 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=1736508731; x= 1736595131; bh=UNnGfgGf7tZwpczUFQXyQa9fnyCCAfZMw9aJVyVxYRQ=; b=b AIlRbxzU8tjcKhWDUOvrFkwM2TbJvT6/MpUiPn32kzoe3kvEi100yj7arklEfedr KrVb/VCwRiKUY5jTK60oUmzDC2aLMQZ+HPFNVg+oqQaOMfozg7YqDJAU1igLk/iQ nq6XmDmG3xYvzw+k9qMXUUQ6Orn7RS6wFa2fhp4kV90o9oXrtg6CIkJFzY4u5lUH 2QYZQtkw0+UJvCh8sauJFhbelWBkeOswR6+x6qBfddZPsBE6ZZn/wfgNGeW6vwp3 syi03qTLSeGeSYXFgJeiQkJqIUxxpUKaZP+JYJI75l+3ugIKZgPdDXLVqvgfiHyr CeFxhkR3JXIVJgje3XIyw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudegkedgvdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertdertdej necuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrih hmqeenucggtffrrghtthgvrhhnpeffueeiudejvdekheeuvdekfeffiedvueelteekudeh jeetkeegvddugfdtgfeileenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmh grihhlfhhrohhmpehpshesphhkshdrihhmpdhnsggprhgtphhtthhopeegpdhmohguvgep shhmthhpohhuthdprhgtphhtthhopehpvghffhesphgvfhhfrdhnvghtpdhrtghpthhtoh epghhithesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehgihhtshhtvghr sehpohgsohigrdgtohhmpdhrtghpthhtohepphhhihhllhhiphdrfihoohguseguuhhnvg hlmhdrohhrghdruhhk X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 10 Jan 2025 06:32:10 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 5b306949 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 10 Jan 2025 11:32:09 +0000 (UTC) From: Patrick Steinhardt Date: Fri, 10 Jan 2025 12:32:06 +0100 Subject: [PATCH v4 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: <20250110-b4-pks-ci-fixes-v4-10-6e4613446080@pks.im> References: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im> In-Reply-To: <20250110-b4-pks-ci-fixes-v4-0-6e4613446080@pks.im> To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano , Phillip Wood 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