From patchwork Mon Jan 6 11:16:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13927197 Received: from fhigh-a2-smtp.messagingengine.com (fhigh-a2-smtp.messagingengine.com [103.168.172.153]) (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 BC6FE1DC9BB for ; Mon, 6 Jan 2025 11:16:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.153 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736162222; cv=none; b=blANXYHMLIiA2IkxD1EBGLbaSQodDBXRvI3td+kQYZkAAqKJGrxBJGY5XeNeiBwg2YLiUcu0ILm3HXHH1Pl1f8au5lI3XcajAIKL/nrKRBZMNerFQJPN3b/aFBM2rG0VUmEhtmcTl1YIyeShntPc4YYEDDrGQgt/g+uGFh3R+HQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736162222; c=relaxed/simple; bh=z2yXrFIIx/kzY+XRyEzDmzKJ2mEeomjwJNLuoJsBiHo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WZve+PEm5Oj7a2XzonrdC5wE5ITTlNKk0PcSHKXB48uQY6KLu7/rI5dbOv5YZkL+23UphqHTvILHt7dQvlF9imKbMz33MvPQzO0DxbAbUa0d1FCkSbzTB54DmGrR1B8yckJwmFu7e6rcqEUhoxAhFvSzeCjn3ZC7vS6r3rNfwFI= 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=NWr/zaCB; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=t/eDSZiq; arc=none smtp.client-ip=103.168.172.153 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="NWr/zaCB"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="t/eDSZiq" Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfhigh.phl.internal (Postfix) with ESMTP id 020F0114015C; Mon, 6 Jan 2025 06:16:55 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-01.internal (MEProxy); Mon, 06 Jan 2025 06:16:55 -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=1736162214; x=1736248614; bh=xDGWAlUYMLnmvk9Zdzu5+T+r+PHSVzDC+gN0Cds64ls=; b= NWr/zaCB464kFWMFfvRUKMuITlJqaS4xc2tHqB27msrE3nL11tYutXRK4kYr9Akz ke77U7XxQxOKU6RbPTN/wn4dZEpHZmoLRD9kEiOAwbYcy9JRlds18Nk/CN/IwC+B VRWKYXzOqNuZcpBcbK8BCvqMiCNnz99qxcdYNA/WyInNQPeLLYbz5Pt2VHMsnue7 ZxVGWiGWs0ftpiJkAW9Kgp+xDo702V2P5OXGIdsX4dsBSlzTBStdYt2aFM31KQ4x +Piuqz7rdzPSWyyAPufhpIzLL1jz+AhpBW79cSlactTiceXK8Oh3FuHtnuNliPCH kty40HNcbpZ+JLudPHhzvw== 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=1736162214; x= 1736248614; bh=xDGWAlUYMLnmvk9Zdzu5+T+r+PHSVzDC+gN0Cds64ls=; b=t /eDSZiqGoCyYsJ1YtTgwLNFvLMDsCssjJve+cVTxdAPF3iy/jQnOdhdwa/QJz0mv FPU/VMlgpMiMiyWY1KcKt8WDM3sTtRMxsrDQ3x2ZVbfWfPLLvSIU4rE4Y81get9w mc2+znGycqasgdAyp1mBygCuX6Kfri/tQV5bYpnrxHUGqhgIxCtoJPCikEchIZIX w2uGF4pLYVaLRmTG1aChZfysjM8oh20kl614y5BjHdjK4VjDaYO9etA1O87JQSN0 G9cC+0Hv091McD8FYpXyqKh3EPtpJf/Q4HP9ujHXkBFuV04bNc2VtVxJTh1qgzwA xF4fux2TO9C0siXjnuNaA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudegtddgvdeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhfffugg gtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufhtvghi nhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepffeuieduje dvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimhdpnh gspghrtghpthhtohepfedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhithes vhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehgihhtshhtvghrsehpohgsoh igrdgtohhmpdhrtghpthhtohepphgvfhhfsehpvghffhdrnhgvth X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 6 Jan 2025 06:16:54 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 799033a0 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 6 Jan 2025 11:16:52 +0000 (UTC) From: Patrick Steinhardt Date: Mon, 06 Jan 2025 12:16:50 +0100 Subject: [PATCH v2 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: <20250106-b4-pks-ci-fixes-v2-1-06ae540771b7@pks.im> References: <20250106-b4-pks-ci-fixes-v2-0-06ae540771b7@pks.im> In-Reply-To: <20250106-b4-pks-ci-fixes-v2-0-06ae540771b7@pks.im> To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano 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 Mon Jan 6 11:16:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13927199 Received: from fhigh-a2-smtp.messagingengine.com (fhigh-a2-smtp.messagingengine.com [103.168.172.153]) (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 F130E1DD0D6 for ; Mon, 6 Jan 2025 11:16:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.153 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736162223; cv=none; b=XPDmn0QYtAHsIlmgQiqzODyDkgDW7DhtXxhekzHIQiRXDydW1lmmqyPo99B2ly6pmnZEYwwhejWCkd8a+6wmykEn9TNJMB6xBloJAUhk8rpMm+6+Gis+gNUPURXXDOh0rnj5DoUlISGugYU9IJIC4HDVIoUMwjQ1BUaYEwLgl1A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736162223; c=relaxed/simple; bh=84uQVCFHujT6wpkXE8p9FyIG/nrxYqx2FKfv5UN5LIE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jR8dT67rHay+z3A5t5mO12ImS7aQ8eFeNNgHGxvhCSw4dyZezVY/Zu+T8DfX5wxTG/CI+JgefaUnXNLZfgJD1aTZ/KXqVyxiublC8zrd0VoGFzSCEttfPTX5BSsyGtddl8Pj78DM6/pcZNsNGwbqV9F//2TLBKmpQpBpWWkYXbY= 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=K7HaE+QN; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=rxSkutwG; arc=none smtp.client-ip=103.168.172.153 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="K7HaE+QN"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="rxSkutwG" Received: from phl-compute-03.internal (phl-compute-03.phl.internal [10.202.2.43]) by mailfhigh.phl.internal (Postfix) with ESMTP id 13CF21140192; Mon, 6 Jan 2025 06:16:56 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-03.internal (MEProxy); Mon, 06 Jan 2025 06:16:56 -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=1736162216; x=1736248616; bh=/ilJODA6fgcD1ENAhqf8EtaO6YmHhyupxU3bxKUwuVk=; b= K7HaE+QNfMrI2XZiD1ka3g/DvmqLdjxTafZVk8fO2lklby1a0ZwtaT27rvZFCGb/ DhZ0aYjxHeMNGgtwsbeBd8nIiz8FqOAqUOwgErHrVbTxsGqKgpZUiBrTX4YeEPR/ kxoFw/pVqqu2w784U4HdWToUeqSI4xDjmZSaIm69VhzJ+yzTjrchstG6too+BCr2 SmIZnXHefyWXqnQp73Cemg+UarXHWicU/CKaPEREC7VCiplodIYlq80EJvwGsfSi bKOr+ZIEPKBf4f2Lpb13LXxCQL5nTvhNHe1KYUiI5hB+WicAGH7v32Tnw9Kt7QPg SW5ur/ZUAlKc9b7+PvRSvA== 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=1736162216; x= 1736248616; bh=/ilJODA6fgcD1ENAhqf8EtaO6YmHhyupxU3bxKUwuVk=; b=r xSkutwGDCnxjOqm9Xfpi9ymLcTy89sdAobcScyygd+jjdnRVQlSWVed7MZt4uS1t hwBMCl7LU2M58smcZOG9ZWjWWolDuUV6aXer17A+Aaxpoq4raLn8eQH9wcu0OnI4 +ihiR2t41Zju6WJeZ7GaBWsvD9Y/VdAoMW89EOmIU6oobQh8uQc8bfRl86ab5XKn 0cwqBBTrIPYLZjHPM9sumTqtW2CZQ/hDAnaOzLHMy6NHYj3OLADE0wFTOgVV7gMk IQtBASo/+rLc0tXbWfhG951KWlwhQ7hTad3ob8dCYLSzIYH/4ABwo+1rqLoNmYs1 y/8dL0j5pPcvBvBXK9U+g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudegtddgvdeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhfffugg gtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufhtvghi nhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepffeuieduje dvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimhdpnh gspghrtghpthhtohepfedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepphgvfhhf sehpvghffhdrnhgvthdprhgtphhtthhopehgihhtshhtvghrsehpohgsohigrdgtohhmpd hrtghpthhtohepghhithesvhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 6 Jan 2025 06:16:55 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id d85a3b01 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 6 Jan 2025 11:16:52 +0000 (UTC) From: Patrick Steinhardt Date: Mon, 06 Jan 2025 12:16:51 +0100 Subject: [PATCH v2 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: <20250106-b4-pks-ci-fixes-v2-2-06ae540771b7@pks.im> References: <20250106-b4-pks-ci-fixes-v2-0-06ae540771b7@pks.im> In-Reply-To: <20250106-b4-pks-ci-fixes-v2-0-06ae540771b7@pks.im> To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano 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 making the writer fill the pipe buffer before we execute git-submodule(1). Ideally, it would be git-submodule(1) itself that does produce all that data, but it would require us to create a large amount of submodules, which is inefficient. Instead, we use Perl to print gibberish until the buffer is filled. 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 f21e920367..9338c75626 100755 --- a/t/t7422-submodule-output.sh +++ b/t/t7422-submodule-output.sh @@ -168,7 +168,7 @@ done test_expect_success !MINGW 'git submodule status --recursive propagates SIGPIPE' ' { git submodule status --recursive 2>err; echo $?>status; } | - grep -q X/S && + { sleep 1 && grep -q X/S; } && 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 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/t/t7422-submodule-output.sh b/t/t7422-submodule-output.sh index f21e9203678b94701281d5339ae8bfe53d5de0ed..976f91b0ebd9d82daee3802a212dd3f4031fe86b 100755 --- a/t/t7422-submodule-output.sh +++ b/t/t7422-submodule-output.sh @@ -167,8 +167,14 @@ do done test_expect_success !MINGW 'git submodule status --recursive propagates SIGPIPE' ' - { git submodule status --recursive 2>err; echo $?>status; } | - grep -q X/S && + { + # Stuff pipe buffer full of input so that `git submodule + # status` will block on write; this script will write over + # 128kb. + perl -le "print q{foo} for (1..33000)" && + git submodule status --recursive 2>err + echo $?>status + } | grep -q X/S && test_must_be_empty err && test_match_signal 13 "$(cat status)" ' From patchwork Mon Jan 6 11:16:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13927198 Received: from fout-a6-smtp.messagingengine.com (fout-a6-smtp.messagingengine.com [103.168.172.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EB3961482E8 for ; Mon, 6 Jan 2025 11:16:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.149 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736162222; cv=none; b=io+b01UVHjOWOCm+QpttjwXdpTmvTn32u4cottaz60MqWadT55xJMUlLbni7oJuSLIIhj71gSxjNitmMqmO88TbklaaqdHutPU32c6VU+0Pr6OJzcmlfG67DstskSgfCuvy5Ts2QWsnbTFM2nJ/wOTXvEV9j/waal9P600zceJ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736162222; c=relaxed/simple; bh=JOb5oLzyy/Ttl9juYQrAJN3u3SGjVPCI+PaeHIIj73M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GTvvg/TOJIS5ZKM4+qrzvFJ0t1JZn6cy5k1gizRAOs2cv9mJGhqboS/8fq26PW00QncKiPKuhmkrwrEvTBbAbmlvBBxTUS6CRmqYE8G1ZPSgKvXmeIhLeHxQCyBnF7U7+k71ptjSOWF4njhJlw0jZH7f+OouLCK8bo/uwuarDyM= 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=qBwxjITv; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=VYkrihNm; arc=none smtp.client-ip=103.168.172.149 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="qBwxjITv"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="VYkrihNm" Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfout.phl.internal (Postfix) with ESMTP id 510FE1380946; Mon, 6 Jan 2025 06:16:56 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-01.internal (MEProxy); Mon, 06 Jan 2025 06:16:56 -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=1736162216; x=1736248616; bh=x9FpIJNmgfCygBCKPXhPIJcGPQTYL70d54C6j/lqx08=; b= qBwxjITvpe7IWjVEDE/k3M6M0+NquA5mvSsYzHyvbkaINYsWPF3e5LmAcRuHEpc4 hXFTUMfyNQjbU0ePiXlUgYnHnojgLROYolscjNtxgh83iQhXEgtnfQIOmZoqFL/Z +PmlENV64KfVbj9VylMAQMmHencJcORfG/yH0XJHJYzS0LME4fq39ju8ROQ5mm0y fFrTKtWFNIxHbotux8WBv043isWhdbF74M+Cu6WKloF2lHn9bbPFobSdrzOwmfPz LlPLF17eb8HQbmpL1mXj47iR3WDG4A3asFAJ7vhCHgMNRcCD977Ol8bgikl4bBKY qxlDv5Il1ruAIHKqqfsMCw== 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=1736162216; x= 1736248616; bh=x9FpIJNmgfCygBCKPXhPIJcGPQTYL70d54C6j/lqx08=; b=V YkrihNmOh1Wyk/ZDICOmwLDJxIuiepxTGJrBRj4mhKOKneKwUULDxIdZDMbsx8z9 c5bZ3i5jy9VL8bpnKb7pYqpfjbOalLVmi98EJGwwRte6cm1HmzYv4DaMcwVE9qGk fvcWVNRJJ7WkvXYFbTEU+3Np9TiFrIkwnLszFeV8IDcxRzgqSbNVmUFKbNmF2XDL DIf2/uYKxyQk9Ymh6awb4AanwElm7elRKYx4W8iVsoDnpiq8CCGugjkvcvJLJK7N K5Bg7z/P7I6MUQ58POyLlmg8j3+p+mxEVhPO2pssTHr/JvFF00BkKWGO+uamkpj7 Tkr49JQQh96ay9ZsDCKvw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudegtddgvdeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhfffugg gtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufhtvghi nhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepffeuieduje dvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimhdpnh gspghrtghpthhtohepfedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepphgvfhhf sehpvghffhdrnhgvthdprhgtphhtthhopehgihhtsehvghgvrhdrkhgvrhhnvghlrdhorh hgpdhrtghpthhtohepghhithhsthgvrhesphhosghogidrtghomh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 6 Jan 2025 06:16:55 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 88897562 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 6 Jan 2025 11:16:54 +0000 (UTC) From: Patrick Steinhardt Date: Mon, 06 Jan 2025 12:16:52 +0100 Subject: [PATCH v2 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: <20250106-b4-pks-ci-fixes-v2-3-06ae540771b7@pks.im> References: <20250106-b4-pks-ci-fixes-v2-0-06ae540771b7@pks.im> In-Reply-To: <20250106-b4-pks-ci-fixes-v2-0-06ae540771b7@pks.im> To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano 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 Mon Jan 6 11:16:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13927200 Received: from fhigh-a2-smtp.messagingengine.com (fhigh-a2-smtp.messagingengine.com [103.168.172.153]) (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 F190B1DD0DC for ; Mon, 6 Jan 2025 11:16:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.153 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736162223; cv=none; b=FVqEeNtm5QiJyiVlfTkfaJrQdyi7anvrbAJCHr4R2MtwnOI8cRO2T63WiQ4dhonBu/FKgu1NF6xMERwQ4XMaVCxuerrZvE1oaCwIfYMe0MlWd1ikW42Sy1nL/XUkK3W8HbA3fMkAdkCCpCiXSoz0S9T0Ug94DH2lMNJMcqK9LeA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736162223; c=relaxed/simple; bh=iXUBghgz+jqbZeF0ZZx009F8BYBVHP+9neCovN2CvvI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=N8BWo+7ONpszaze8eJVBB9N/lEtWHwimr7f2nvpQ9seuaoMaGN8OCz75+FyxPh1S70BW99cQiIpdp5FmoE6OF650d9hYHaTIrRelJext8A4s6jJPc4SKdwIp5gVeXQ1oXOEUcmzlsFLqPGhQ6gP4qV0fq3xHRTAGieNutgm/irw= 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=JjNDPSMj; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=pWR3LjTj; arc=none smtp.client-ip=103.168.172.153 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="JjNDPSMj"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="pWR3LjTj" Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfhigh.phl.internal (Postfix) with ESMTP id 24DF81140500; Mon, 6 Jan 2025 06:16:57 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-11.internal (MEProxy); Mon, 06 Jan 2025 06:16:57 -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=1736162217; x=1736248617; bh=TXisYeudCbnuQitwymqpMqWl6wW3MJ+qGP3Juusa0jQ=; b= JjNDPSMjIllVK5pJbRjYEWultX1au8rjyz3beFujoEUAibZj52GUcRwLgc2xw5L3 RitJ8aerMk9VaDZfPUTRLjuGci4gjqQZ+bq8w+q94GCRxe10stm5EG9Jil2F9rYP ZtlXYM9uHTui/R6uc2HIvuA4siPolCt5dm05lZesAOGFPziXFznbY1KSvY6OJlOd wOhgK4ZAdiXNFBxbqY0VlrQ/aHIpmZs74G7yGm18f0cxEZG5xUHCcM3AG15oXmNP tvCgDP64CmRIANSajlt+dgUHS9rz8wsI6L8CPRELyHUsZpBH0CcanwM1srvk2Pco InRWqYtfhGDkodCcNisqqg== 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=1736162217; x= 1736248617; bh=TXisYeudCbnuQitwymqpMqWl6wW3MJ+qGP3Juusa0jQ=; b=p WR3LjTjZTBDgOecKAzLRt4Szk/nJFmui4VwNieSAEtEE+0hyeRatbXv5dK43edHI QgpVNEcQZj82pbELJ5tDonEaWHt+/toUl0BrYLVpu+IIPR3I7hQdMgdLFwssrNly 8PZc/jjP9Ds2dp0b2XBAq1gept2+YJQviXMNdX4zZzfMIntR3smge9aX3xSUqUMN ywnn98Qer660r1s1Aah5bZBXc39VwUA7npWDj+rqvdqkx37vQnx5KVzUTf0StPYj 4RTDQ2Ibr+Mi+if4wtSj+H7ZRr4pT0nGmAtVAh6KN9iG1hv8x2wrFRiWmLovB4xl BzUKhRKOt2pcG8RM+5dEQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudegtddgvdehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhfffugg gtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufhtvghi nhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepkedvueefud ejhfduhedukeefkeevtddvuddvfeevhfffuedvtdekffdvtdettdeknecuffhomhgrihhn pehkvghrnhgvlhdrohhrghdpvhgvtghtohhrrdgttgenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehpshesphhkshdrihhmpdhnsggprhgtphht thhopeefpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehgihhtshhtvghrsehpoh gsohigrdgtohhmpdhrtghpthhtohepphgvfhhfsehpvghffhdrnhgvthdprhgtphhtthho pehgihhtsehvghgvrhdrkhgvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 6 Jan 2025 06:16:56 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 9267307d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 6 Jan 2025 11:16:54 +0000 (UTC) From: Patrick Steinhardt Date: Mon, 06 Jan 2025 12:16:53 +0100 Subject: [PATCH v2 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: <20250106-b4-pks-ci-fixes-v2-4-06ae540771b7@pks.im> References: <20250106-b4-pks-ci-fixes-v2-0-06ae540771b7@pks.im> In-Reply-To: <20250106-b4-pks-ci-fixes-v2-0-06ae540771b7@pks.im> To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano 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 Mon Jan 6 11:16:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13927202 Received: from fhigh-a2-smtp.messagingengine.com (fhigh-a2-smtp.messagingengine.com [103.168.172.153]) (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 A45751DC997 for ; Mon, 6 Jan 2025 11:17:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.153 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736162224; cv=none; b=KyCIoA7+2oGlRezxg4TiUzUitB6FpBXKBanZ8q4Kn9cDYZZTw6KHptDox8WsA1qSH2C3AJLZYMWtdFnXV77+Ur7zBXnZa12NF6aqcy39qK6etIZzXmx35lvLX+In/QAnsyAiDxfQY/u3ncPMYnZj3+O3x+qpd6qv2t2P6vHkCrI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736162224; c=relaxed/simple; bh=dzeIst7pgTEPd5JlhKlh0EXtX39CUksm25M4q0qLNP8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Fs0bu7pT+S8vmAZULIInrLKE2Xil/Tj0CyvvBdsUuTYTjTgQ47IZrHT4mBG3PWDBeEJm6g8fz4xjj0lrL5+wUC+0arSf756j7xKsf4cQPleEcEJ1b2dqqPEsXqAxHLbVAXUVzL4PLuYJvfdGPxbIc2mcmajEK9minnvE4MHgUT4= 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=GFGyU/jM; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=elYDbmiI; arc=none smtp.client-ip=103.168.172.153 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="GFGyU/jM"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="elYDbmiI" Received: from phl-compute-03.internal (phl-compute-03.phl.internal [10.202.2.43]) by mailfhigh.phl.internal (Postfix) with ESMTP id 62EF51140143; Mon, 6 Jan 2025 06:16:57 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-03.internal (MEProxy); Mon, 06 Jan 2025 06:16:57 -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=1736162217; x=1736248617; bh=GulJbzb00DFN2pjl2QPk7DmclqJZT9603LbzW1fidDU=; b= GFGyU/jMU2h3+xfAM/5aHLwubpr5ewdC80gFuaS444HJHE/wFdKq44YkUrjloala ZjC3C7vwLsTPA+NQGGuSFackfchlj635mu84GXnnv3QiW02+qvRgtszNJ3+qcFf9 3iOABJB4d2NH4btYzho/EwiS20oJrkNfDn41aFf8DqNbtHnUPVEh36TF075vpIsp TxaXyplCIj8i0dXLTEGgKTfax7gF7N1NnK2Hrt4pwUQTG35LOzc5Y1Q8CVNBJv3/ baT9frST1qq6ao+ursvDndMbcDanI24arG+take3pXgU2+GmKZ9eVmtwZ3bLTNh2 j47ZHnv85mUsfY7kAvPx6A== 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=1736162217; x= 1736248617; bh=GulJbzb00DFN2pjl2QPk7DmclqJZT9603LbzW1fidDU=; b=e lYDbmiI5gF9zIGHQZGUWOJJnGNHdhCIn0v7laSQFeYuwzxiZAS3ImLp6xQGuQ3oH sRgGzsGVidO8TNg3UBz7dG7YK1O7X67mlWUEWrXa/5wTPSH2cH17olzSP3L4YZH5 kTbZaJ9g5Ffx6j9bX7nlzewAUAeYo8yIvnXCXUegANXUKlt4IDgUdDEa52KHAe82 7xjf02DMC7Tx3V2oDCbOtUWrs7BTsaFm6i0bcsV7yIuKAI4rUEq7y/T7GEMP94bt CqxuoXKOCZDwMThQWEH5l9SaEqUW//owymNVUtKsUu17pzwp4PjWBE31mTl5V+sS IPp5jq4h6N4ZDCMSUrb2g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudegtddgvdeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhfffugg gtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufhtvghi nhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepgeeggfelgf ekhedvgeffleffkeekheduffefvdehgeeigeduhedukeelieevtdfgnecuffhomhgrihhn pehvvggtthhorhdrtggtnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepphhssehpkhhsrdhimhdpnhgspghrtghpthhtohepfedpmhhouggvpehs mhhtphhouhhtpdhrtghpthhtohepghhithesvhhgvghrrdhkvghrnhgvlhdrohhrghdprh gtphhtthhopehgihhtshhtvghrsehpohgsohigrdgtohhmpdhrtghpthhtohepphgvfhhf sehpvghffhdrnhgvth X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 6 Jan 2025 06:16:56 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 004b600a (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 6 Jan 2025 11:16:55 +0000 (UTC) From: Patrick Steinhardt Date: Mon, 06 Jan 2025 12:16:54 +0100 Subject: [PATCH v2 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: <20250106-b4-pks-ci-fixes-v2-5-06ae540771b7@pks.im> References: <20250106-b4-pks-ci-fixes-v2-0-06ae540771b7@pks.im> In-Reply-To: <20250106-b4-pks-ci-fixes-v2-0-06ae540771b7@pks.im> To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano 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 Mon Jan 6 11:16:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13927201 Received: from fout-a6-smtp.messagingengine.com (fout-a6-smtp.messagingengine.com [103.168.172.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A3A801DC05F for ; Mon, 6 Jan 2025 11:17:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.149 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736162223; cv=none; b=lvlFTl9FXc790LC8ddXOHCVTklX/IjjiEZAl3Esksqc3hw1jgkrBwmv5BRA/jm6wygSF2RnAUYtQVkz7pZUOMogoX1UQT6gviDt1WjHGGe098/EuMG/+tC3eXfwpF+ZmtgXPOjS1fYI5xtlaXbdKfKAiuc/lBaJ3wKkwH1xrGTU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736162223; c=relaxed/simple; bh=Xl3iX0VJ/u7NFlmmljA+bD8ey5H/8HtM3oLC5UJ5MU0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CWx8jvPdqY9xOHWe25UHBQArlKrkPsbXVVQhBQ1P9r5x0pj9meGAlN6ofVl7M6gGja9vuixOJ7azvmYf2U9Em/taFwkkwGf93i8bo/1Cp+WqWibFAUJC5MdiEUSs+iJ23WYNlVozAqZtZjRbf00wgMZg3WbpIoaj9z8goQxKWWI= 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=nB4hrMVH; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=lv9TnwM0; arc=none smtp.client-ip=103.168.172.149 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="nB4hrMVH"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="lv9TnwM0" Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfout.phl.internal (Postfix) with ESMTP id 3055D138087C; Mon, 6 Jan 2025 06:16:58 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-01.internal (MEProxy); Mon, 06 Jan 2025 06:16:58 -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=1736162218; x=1736248618; bh=ZGukKVurnzK+MilwZ7Q/qLxdA3ZGB6RCeV86FtNkMNk=; b= nB4hrMVHvgm/4zPDbLPaXcE+iO8vfJNSsNZWWYlswG+iV02aMUlh+IU8uVKAydoG CAExYBgUbYmKXYOaWCQcVbOdolR/iskb/tX6Eea/HsTnVFhlFOXB0F7OPpmi3Vwp vTFcU28PbBDFrNCinXdXXcQubwwUyZhGzhXrbgguJ18nKuAAgMQA7CszjiLeXPXZ quW7n20wObNksRWlYPQ86F7wm6ieXqNGbLE5+v4rpbM6yrYW1371n3wVu9A7vsX5 hUIksCijW1ViwnOCOiKOretD0cizDsn7KzglXbRN8c8AHezQGj10NQfXOxpVqA3M xl3DGfTLNJFN1DAlGwduOQ== 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=1736162218; x= 1736248618; bh=ZGukKVurnzK+MilwZ7Q/qLxdA3ZGB6RCeV86FtNkMNk=; b=l v9TnwM0XDbGlaeC5/z0Q7gCtkGZO0Lw+mvegqisJ2DVbjLlQ6PD+8VHzeqd3QvRt WMFIpzkHC3F2dVV3pmXDNlWQi+2fdqzzyEp1jzCnkJig0ZqpM6RKMEuC277GUjsk HorjsDHM6Evi0cLS/0uaQRJJPKElGUkjQAwrkWuj5hRDrbKNjg34s9gVGMLv3+2L k9MRMNwzNWl1VuPNu9u0NZxe3j8Y3hSTnBD9tTLUs+AWL4i0H7DicbT7755YFlBw PUTXtvDJL982A9X42ose0Mh1SjnlA6r422S6I5fA51o/SdEYhBbiX2Kklf9eiwmf S7HmMPwwyloXvo0ps1f1Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudegtddgvdeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhfffugg gtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufhtvghi nhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepffeuieduje dvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimhdpnh gspghrtghpthhtohepfedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepphgvfhhf sehpvghffhdrnhgvthdprhgtphhtthhopehgihhtsehvghgvrhdrkhgvrhhnvghlrdhorh hgpdhrtghpthhtohepghhithhsthgvrhesphhosghogidrtghomh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 6 Jan 2025 06:16:57 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id bb49a541 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 6 Jan 2025 11:16:56 +0000 (UTC) From: Patrick Steinhardt Date: Mon, 06 Jan 2025 12:16:55 +0100 Subject: [PATCH v2 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: <20250106-b4-pks-ci-fixes-v2-6-06ae540771b7@pks.im> References: <20250106-b4-pks-ci-fixes-v2-0-06ae540771b7@pks.im> In-Reply-To: <20250106-b4-pks-ci-fixes-v2-0-06ae540771b7@pks.im> To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano 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 Mon Jan 6 11:16:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13927203 Received: from fout-a6-smtp.messagingengine.com (fout-a6-smtp.messagingengine.com [103.168.172.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A84AB1DC994 for ; Mon, 6 Jan 2025 11:17:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.149 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736162224; cv=none; b=cQFDUKbeaGBgN61Ssty9erfrxy+E2BToxNPMvTC1gMpsmFLuAisjoHiGNVWXMKG46CxEjR3nwqRD78UzzrS8BmHoaOs9ns9qHwvD71JY9DfZU23LIcgX6+o1iHbQf+er82xFhirflGQaoBGWED+Pcg1lI+zJib6mPz6vPWezVrc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736162224; c=relaxed/simple; bh=LidPJI6V9UmFgwMJw9iM67Ikb83ruK0/SpwILWhwL/s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IWrAItY30PKCXWjjQnWwQLsPd5XvPsc6NLqUUP0/fDGfYZ5wNWlIpHy5TaLC5YJ7/lm37T5OLRyr9ZPezJ6p26P4m7xjkrWNbbMmkRDSfUDQ1jSzteEx9ShQ+HERU+4hkvRHZue5BViz6OmQo+9gIvaOUxDNEuLXU2MPSfr9V1w= 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=ca5VBkB6; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=YfJFLn+k; arc=none smtp.client-ip=103.168.172.149 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="ca5VBkB6"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="YfJFLn+k" Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailfout.phl.internal (Postfix) with ESMTP id 5345E13809DC; Mon, 6 Jan 2025 06:16:59 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-06.internal (MEProxy); Mon, 06 Jan 2025 06:16:59 -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=1736162219; x=1736248619; bh=xy8iUdpn3FdyTuKqG/1BpLHGxE9iZc8tfbGxMAfX/xI=; b= ca5VBkB6tvma0hpsSWJjeGLF1GpoFmyWmvvAhTZuSTXub2JtGi/s4GT9EH5E4Qag kFEhhl6ON5dAXTH3zxPZDgB9wKlp6S7k803YG2FyEbZIENbdlWdxNK8ScuLR9pOF HgfPXyXIgghhQE4d0BPqm8Er/ql40RiNA63VU/NNSptQLKX80TuzJ9r8uKkI9plq X/QxxwLXSkNzyDTtT+WWh25AZvzS0FEcP8m8YsCLJfCiyZLVFiED4FWyRdEQXGJQ 5Xn/YysQUbCwJx9zFO/m1cwUXoj0v/K4nZfAwyNKPj2RTJsZBVaU/56lzGU1gDMx 2gXHpQm88huvZwI3rerpLw== 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=1736162219; x= 1736248619; bh=xy8iUdpn3FdyTuKqG/1BpLHGxE9iZc8tfbGxMAfX/xI=; b=Y fJFLn+kR5i3K2XOx5zVltxwk3d+fNZs6dx0EtGCM2fjT/MD9wf3j/6z9qled3/wI iiMdd9440uEwpdfQ061Dps4aGHGcMIc0So0blHCPycDXLzfbbBakWavebmvkidXx RPuWv8OBXQO3zXEtlpOBYcnxbqy0tUsa+lBxy4wYoupaV9j60lzB9HwZx5UEFAkv 08vTqezQ83Bw39xxEg9hGrl/typ6elCNFMnDDs7hLNQtGjEB7awiWCZ4ZJleFema p4ICm/RPx/0xg2sj6XJYdQmVFeX0p6XUcPIPb5aOW7pIrikhJWczTyhqf9cXu5PI rbI7SjaiTTNhyCWBSsImQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudegtddgvdeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhfffugg gtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufhtvghi nhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepffeuieduje dvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimhdpnh gspghrtghpthhtohepfedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhithhs thgvrhesphhosghogidrtghomhdprhgtphhtthhopehgihhtsehvghgvrhdrkhgvrhhnvg hlrdhorhhgpdhrtghpthhtohepphgvfhhfsehpvghffhdrnhgvth X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 6 Jan 2025 06:16:58 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id b44f913f (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 6 Jan 2025 11:16:57 +0000 (UTC) From: Patrick Steinhardt Date: Mon, 06 Jan 2025 12:16:56 +0100 Subject: [PATCH v2 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: <20250106-b4-pks-ci-fixes-v2-7-06ae540771b7@pks.im> References: <20250106-b4-pks-ci-fixes-v2-0-06ae540771b7@pks.im> In-Reply-To: <20250106-b4-pks-ci-fixes-v2-0-06ae540771b7@pks.im> To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano 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 Mon Jan 6 11:16: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: 13927205 Received: from fhigh-a2-smtp.messagingengine.com (fhigh-a2-smtp.messagingengine.com [103.168.172.153]) (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 8F0211DD0EF for ; Mon, 6 Jan 2025 11:17:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.153 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736162225; cv=none; b=S7UfYYdBf5UvrO2tDhu6fHd2pYLE8kYIPKSyOSGtINLpz6ctvDfmD4Gdj8l/0DnoVd6f0V7tFSm17NndCvEwJjBDLc+VoyInl5wr4WDADeem1u0ASxIJhcfug2ZtwatUmVRtHzW/3TdB4v5d8W+5ZxGkr0+UaPXH6rpxgnWl1T8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736162225; c=relaxed/simple; bh=9U5pSa1Ya/qFA16RVITh0ufhTFoyrRiuuHsuhrHW4xI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dOdClze9urKlFUBEpvggButyWunLtTIYdfPMuxSl4dSU4kZb8A63KuK5DpC6fWYXVFWqsqZ5Z/sPXJL/cvCgFkHfkUcsngEFLkEZ2Po7RBiR/AvdpcLanugdn7/v7xOV2Dyy8+4qoJneFk0yQco+RLyaq+/mBzLhVRe2c1Yc2WM= 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=aCDJX1Is; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=WeUXCFwz; arc=none smtp.client-ip=103.168.172.153 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="aCDJX1Is"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="WeUXCFwz" Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfhigh.phl.internal (Postfix) with ESMTP id 74E1A114040C; Mon, 6 Jan 2025 06:17:00 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-05.internal (MEProxy); Mon, 06 Jan 2025 06:17:00 -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=1736162220; x=1736248620; bh=NHmCDjoh5XWaGXJRxFyoi47O19R/mtulCqgmb/hGRHg=; b= aCDJX1IsdKe+njtgeD5HXsWIKXWrXNpqdWrQE9XldZuavJu7reuswijnBxJUqqj5 qDsZTI4h1oHOHB+s9AoAOxv5g1EQQ2auSZ2/+xclS+E3bNR82VKpVVNPkjpvoA3j E90q68k0YyHGVV5+hN191lXckzeJbGm6zRmJfanTgzCPpGCbdo7Ygkfny/R25Xei +1ymX3s2VIb9CJFwHPR0lPVzNvALnKAv5y0ozgXaGlUNEFGhT9uuu6OhEYysIyot 547Ja/Rg6+1ziYv7OwqTlvdACrBIqj7IV+PJVdCXtEGG3iLMbN6IHiIBYqmpedi7 NPnlvpjbfsQwTemKeOdxaA== 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=1736162220; x= 1736248620; bh=NHmCDjoh5XWaGXJRxFyoi47O19R/mtulCqgmb/hGRHg=; b=W eUXCFwzvpfBB0Ih9JGgDGxlGBkzoV00i8w0J3K6IJiUso5R3yO5XcNLW42sb+Zrl qF0UNXHGnKbLHuPSGy1vK0EK4mzhlZTC3xmBQlcj+BfJesunqWLM8c0Wg3wbditb c0kgTLTv6tmRoSzNb/E7JssPCQ8cdy5WNhOwXHpnP1eVgVYkD9EES2Ti4zzFQNHH oesFGm8T6jrjOUhKYZgrG2SYCI7Ur4e4B/XqG9AcwhcOfVKOWdSZuCUlUDGXsfjF QhJ7YEbVS33IDDKvqNnt+ti6g4VuDhkchbKP+vsxJ77dwwN2KC3Zjcu3OKPgvCZ4 IBRcz8G8NHl+O7miwgrWA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudegtddgvdeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhfffugg gtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufhtvghi nhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepffeuieduje dvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimhdpnh gspghrtghpthhtohepfedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepphgvfhhf sehpvghffhdrnhgvthdprhgtphhtthhopehgihhtshhtvghrsehpohgsohigrdgtohhmpd hrtghpthhtohepghhithesvhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 6 Jan 2025 06:16:59 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id cecd8c2b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 6 Jan 2025 11:16:58 +0000 (UTC) From: Patrick Steinhardt Date: Mon, 06 Jan 2025 12:16:57 +0100 Subject: [PATCH v2 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: <20250106-b4-pks-ci-fixes-v2-8-06ae540771b7@pks.im> References: <20250106-b4-pks-ci-fixes-v2-0-06ae540771b7@pks.im> In-Reply-To: <20250106-b4-pks-ci-fixes-v2-0-06ae540771b7@pks.im> To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano 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 Mon Jan 6 11:16: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: 13927204 Received: from fout-a6-smtp.messagingengine.com (fout-a6-smtp.messagingengine.com [103.168.172.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D811B1DD525 for ; Mon, 6 Jan 2025 11:17:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.149 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736162225; cv=none; b=b6gOE7HxoK+3OW5D/kzjt0zgoR6hoijdTkzKUeaXoQsDwv5+hLo3s/cmL5Fe10w8bl1GTfgH6HUvtkOFmftha/8Yy9ugpnpUYpSH4241+sH4syL0nymYcn/ZQYdNYmApcncgG76QemQzhe553nUDOp7N1iE/zS2udqLYkBnvALc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736162225; c=relaxed/simple; bh=G1jPa7P7T6TB45XoieFsgxr0j8yLEOJJZo63ewbJ3M4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cQa1vKqv+x35NzqBfX1x99n29O2+QHAniCJHyNn1OqIBIRbmgtvsG6fIiMK2/tFFjpSEswbE4VpSAAJZXR67hODZKKCnHJUCxmWPlLPnPOAYV1OIPqkmZW8mrghEAddvqPJFFEhND3/ot22Jz45B3Wzh5YFTQHTHhVgBcuk254c= 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=ACrETiF0; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=Vz/fgQfN; arc=none smtp.client-ip=103.168.172.149 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="ACrETiF0"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="Vz/fgQfN" Received: from phl-compute-09.internal (phl-compute-09.phl.internal [10.202.2.49]) by mailfout.phl.internal (Postfix) with ESMTP id 87AF413801B6; Mon, 6 Jan 2025 06:17:01 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-09.internal (MEProxy); Mon, 06 Jan 2025 06:17:01 -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=1736162221; x=1736248621; bh=KyOeinV6oJzx1SRviha9PF63/S2bm6rWc2/2k4n1LGg=; b= ACrETiF0keg2tLCMCk8HPnLgAPNY2HNq8dyKJSsU1GaEKRanqRFNrOQ2OrKnukso 4XEdPKcJPjHzdOpkgMnQmTXEWuY4OsnUCH1MCR5AoEWP7Ds4WHLkKLOJsLdOMe5c BISFa8dkBo+QqCBY2aVETdXnqzj/bodCC46Or+6z3ekXPLk0lo/JxBp05V7Yol8k uEsotgVpm2LBPXPzcVC8GWXVE4xRFxlV4CpRNeRHyFge125DolMitT00lzX3+I1f EXw4MCsOFBTLyi6WbdIH6+O9Jcx/NSqcMT7OkOkLZubrG5gxvSE9LK2na005Yr35 bSfVcDuPRITBsheHhj/VjA== 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=1736162221; x= 1736248621; bh=KyOeinV6oJzx1SRviha9PF63/S2bm6rWc2/2k4n1LGg=; b=V z/fgQfNeY6LCknkfrNeeY5DoWjydRtsXuJv42eD0ciDMbpQN9qEgPUWcvURlIHdU eqsAplKm2/jwvKMAMl9BhYJHQ36/YGXNZmsVxkrzVtt4E/Q/skX7fa9X6rPOrfnm HrrlovEDPxdTD9e1izQpAHFH33DeyNjOadNNSqDHKXbs1i3Dtt5CaL7AV3/s/P7i cHuOCYUpQOLQFiHx1/98M8DuyyMe1GPM0nM5qGujFhqDhalkar/V007HTqal+qo0 JzgYIuY22ELfjXVUg505iktx8NfGN+bxkc8iKKP2B0pAQQA/DXcTNxDUnKUoDgOy k0SOibFZ7AsjfougGFsPg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudegtddgvdeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhfffugg gtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufhtvghi nhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepffeuieduje dvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimhdpnh gspghrtghpthhtohepfedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhithhs thgvrhesphhosghogidrtghomhdprhgtphhtthhopehpvghffhesphgvfhhfrdhnvghtpd hrtghpthhtohepghhithesvhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 6 Jan 2025 06:17:00 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 1b42f77c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 6 Jan 2025 11:16:59 +0000 (UTC) From: Patrick Steinhardt Date: Mon, 06 Jan 2025 12:16:58 +0100 Subject: [PATCH v2 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: <20250106-b4-pks-ci-fixes-v2-9-06ae540771b7@pks.im> References: <20250106-b4-pks-ci-fixes-v2-0-06ae540771b7@pks.im> In-Reply-To: <20250106-b4-pks-ci-fixes-v2-0-06ae540771b7@pks.im> To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano 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 Mon Jan 6 11:16: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: 13927206 Received: from fout-a6-smtp.messagingengine.com (fout-a6-smtp.messagingengine.com [103.168.172.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 198461DD889 for ; Mon, 6 Jan 2025 11:17:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.149 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736162226; cv=none; b=KuXHgWwbZgkoE/BcQRtwIIQ9Lp5gMeWsm848UCz6BtSPV5V9bttlNDiwlCr0N11nbh9TjsrMWMHNroSfmbQvyrOYil6yZeM70docqaJ6K9IY8v8p7HilcQUGgmMxmLwdb6ZzIF3bQdQyioS5eenD4iYonAsO7ygLxo+lW/BkyWc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736162226; c=relaxed/simple; bh=C0kXd14tdNh+8BNpjH8s+KCeED16IX9F4AoXIgQhyns=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RS8jMagD88jgscYCXN5g3URsp1DmTQQoKRWj7NlmdM/nZLIocvjA2XX+FZS+UJCmSGqpOIUKq1nG5VwFTDTPrjYjtcNsvVn+cM/1C96Ztlh/8D9y3uZQNhNSAh66O753yYPg3yIaWW9SfdeUMHbUzMkJ+RjZjyLI3l0yGOltDis= 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=S84yzwPW; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=ANKZhvCB; arc=none smtp.client-ip=103.168.172.149 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="S84yzwPW"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="ANKZhvCB" Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfout.phl.internal (Postfix) with ESMTP id 9CE6D138091A; Mon, 6 Jan 2025 06:17:02 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-05.internal (MEProxy); Mon, 06 Jan 2025 06:17:02 -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=1736162222; x=1736248622; bh=G93ybn4njs+YzJYt3Ui15723ZMuJLM+1PFmip4yBuPs=; b= S84yzwPWk1GmH1ktVHBMMF/0LOakFZFQlHQ3zwCXu7t+WYYZwTyxVcYx6mQy57BR 2xxluOiID8i7QZfZeFXQBO1m0pPqzo3AWjMYQFfcC2FA3Ly5U+FHgeY1K8/HhTvY 9yPHXjXifxzA2DQ4WEaKa3I00u14Qqwvp66O4mxaJEq+rgpYNM94WWYN5I9jJsWt fasrOPokCrz5WqiQDxIm2gUgLFTGWPECg0MLmn9ualaJbI8dOnrLdCp56SO4YIVM 2TwxulRhEo37El4gfJ2fAGta/IXlanmiW8RuGItizcSbZLL7sQgtB4WQOJEmGQhh Lz7Dei7Z/iUkSAyCZzlLYg== 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=1736162222; x= 1736248622; bh=G93ybn4njs+YzJYt3Ui15723ZMuJLM+1PFmip4yBuPs=; b=A NKZhvCBbzHypr5dHI30I71b14mk1xgyWNnqlby8twrsK0afPtoTYekTXpvGR3Snn K1uLxpQxHfe5+9SzpROFY2zaXsoc+BfSY+IEXDpv3kNORn9eLHgcUaD30u1kk5tx TS9gzwBQ4v67J0raob873HAdqJP/aDDmOZHakDKhXjLdKbyTKIEgd07NILZksQLn +ceZ8A/Pa69Y8TYw/dMxWYw39KxT4owxYtJ2Aq/qfdDCm2Iyf7vJuEjcTG4I8A/v ObEVKa98ZusIE99cfgpB9AKIfu/5ajRQ3ZWll5T8U0qB9ozPlwAcuiVled4K5Oj9 rUHj1erTNnIAgN9VU4m7g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrudegtddgvdeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhfffugg gtgffkfhgjvfevofesthejredtredtjeenucfhrhhomheprfgrthhrihgtkhcuufhtvghi nhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvghrnhepffeuieduje dvkeehuedvkeefffeivdeuleetkeduheejteekgedvudfgtdfgieelnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimhdpnh gspghrtghpthhtohepfedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhithhs thgvrhesphhosghogidrtghomhdprhgtphhtthhopehpvghffhesphgvfhhfrdhnvghtpd hrtghpthhtohepghhithesvhhgvghrrdhkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 6 Jan 2025 06:17:01 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id eeb9c26e (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 6 Jan 2025 11:17:00 +0000 (UTC) From: Patrick Steinhardt Date: Mon, 06 Jan 2025 12:16:59 +0100 Subject: [PATCH v2 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: <20250106-b4-pks-ci-fixes-v2-10-06ae540771b7@pks.im> References: <20250106-b4-pks-ci-fixes-v2-0-06ae540771b7@pks.im> In-Reply-To: <20250106-b4-pks-ci-fixes-v2-0-06ae540771b7@pks.im> To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano 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