From patchwork Thu Jan 18 10:22:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13522671 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (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 B4DEC20B07 for ; Thu, 18 Jan 2024 10:22:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.123.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705573371; cv=none; b=FLDdQOmysuLSpdFCcaKMjER8UDZ6Ya0NGtM5Vf80xJjdK+hSeWQzsQfX4TztTw4XBXH8TWbkToMbXNUXTxD9faBYvf0SA2H3ymOyUtIPJW5Nez5zhvkGvXyheF2qVUqqt0srZI5KiOar3yWo+UWyJyf+j5KDvGK8k+iFFk7XjSI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705573371; c=relaxed/simple; bh=wK+2+gUpfNjkJQ05f5iGjLgPRKag1IBF39hdMTwn7Ek=; h=Received:Received:DKIM-Signature:DKIM-Signature:X-ME-Sender: X-ME-Received:X-ME-Proxy-Cause:X-ME-Proxy:Feedback-ID:Received: Received:Date:From:To:Cc:Subject:Message-ID:References: MIME-Version:Content-Type:Content-Disposition:In-Reply-To; b=LzJsPw6t1xUQCt11/NR0plfFCHr8CvbT08CbLAigP96yqrOR1kFwONXdDhos8BgmmA4OSFlBdZEWf9ZX2NYkca8cwaruHBU7vSsE0Mhcz0uCsrzZJoyxYki3War2R6tpEwPMNc4nWSOYMbufOpv01ayycArjPELGJqDfiV+DKhE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none 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=YUtP/5TW; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=BsCvcOqU; arc=none smtp.client-ip=64.147.123.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none 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="YUtP/5TW"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="BsCvcOqU" Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 9C7733200BD7; Thu, 18 Jan 2024 05:22:48 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 18 Jan 2024 05:22:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :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=fm3; t=1705573368; x=1705659768; bh=+iAyRC6/ik 4QrHHjYSEp6uy2a7XDNxSQv9CFh7KHCcg=; b=YUtP/5TWxvXi7DyDmikjg94y4b 1xRqSHIoEMfyhmafAGsMal8qVuTkNwBCnj+2oY0auNvzMTCZ3ySTAlKknz2QcgJ6 49Tt8b6SllbaVwAcc+k3uMvBWtlcWbKjOZmplBxrR7vJiV47N9Aijz5LBp1ivgTC p8jf6yacLCOaUKzKBc2jEwzk6aHnrvE90StslG26L53UWiwj2CumyY7Fk1gCZOAY 1D0oXjKu6cB9OJeQorxcEygrs3QnkSWfhc4sHKJlz3+F7ilbXt5Esdl2ZBuwpMf/ d02E4nxkUOvq0fez02BdHib967BvIgzWkYCVxjMgOcri0y3xW/IRUgXEzD+A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc: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-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1705573368; x=1705659768; bh=+iAyRC6/ik4QrHHjYSEp6uy2a7XD NxSQv9CFh7KHCcg=; b=BsCvcOqUadEYQvgu/QW/PoVk2Y/6Z61F1rZQ/IHv4oiU JDh1mfiLFG3vMDyrr+ruOAsw9zRC5DxRJc84YVD0fZlTcsJA0UL8zB1hZZQIBXg3 RkwaBK7FmBjaVzjgRsHEJw6bFCEqdOXehH33QjTbfb8apcGHRt8Q5CuQzzI90zao 7FF90S4JRsywMlV7nd4AyqUsxIToo8+SaTK2VMDHTHZeyNjaxYj7PgKxX6VVOxfC rbCx38E6tiNa984mooC5Z2JOOFmlGSERo/moF+DRMAv8rTE459ia01/p5ITqe+hk bECNXVDnrvQHte/A7fz+ReyBgBonbidWnWp7uOd6ZQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdejjedgudehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesghdtreertddtvdenucfhrhhomheprfgrthhr ihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvg hrnhepueektdevtdffveeljeetgfehheeigeekleduvdeffeeghefgledttdehjeelffet necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhsse hpkhhsrdhimh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 18 Jan 2024 05:22:47 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id cb9f778c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 18 Jan 2024 10:19:52 +0000 (UTC) Date: Thu, 18 Jan 2024 11:22:45 +0100 From: Patrick Steinhardt To: git@vger.kernel.org Cc: Phillip Wood , Matthias =?iso-8859-1?q?A=DFha?= =?iso-8859-1?q?uer?= Subject: [PATCH v2 1/5] t7527: decrease likelihood of racing with fsmonitor daemon Message-ID: <554b1c85463306809a3503622ec6927165e2f4c2.1705573336.git.ps@pks.im> References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: In t7527, we test that the builtin fsmonitor daemon works well in various edge cases. One of these tests is frequently failing because events reported by the fsmonitor--daemon are missing an expected event. This failure is essentially a race condition: we do not wait for the daemon to flush out all events before we ask it to quit. Consequently, it can happen that we miss some expected events. In other testcases we counteract this race by sending a simple query to the daemon. Quoting a comment: We run a simple query after modifying the filesystem just to introduce a bit of a delay so that the trace logging from the daemon has time to get flushed to disk. Now this workaround is not a "proper" fix as we do not wait for all events to have been synchronized in a deterministic way. But this fix seems to be sufficient for all the other tests to pass, so it must not be all that bad. Convert the failing test to do the same. While the test was previously failing in about 50% of the test runs, I couldn't reproduce the failure after the change anymore. Signed-off-by: Patrick Steinhardt --- t/t7527-builtin-fsmonitor.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7527-builtin-fsmonitor.sh b/t/t7527-builtin-fsmonitor.sh index 78503158fd..363f9dc0e4 100755 --- a/t/t7527-builtin-fsmonitor.sh +++ b/t/t7527-builtin-fsmonitor.sh @@ -978,7 +978,7 @@ test_expect_success !UNICODE_COMPOSITION_SENSITIVE 'Unicode nfc/nfd' ' mkdir test_unicode/nfd && mkdir test_unicode/nfd/d_${utf8_nfd} && - git -C test_unicode fsmonitor--daemon stop && + test-tool -C test_unicode fsmonitor-client query --token 0 && if test_have_prereq UNICODE_NFC_PRESERVED then From patchwork Thu Jan 18 10:22:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13522672 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (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 C25DE210FC for ; Thu, 18 Jan 2024 10:22:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.123.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705573375; cv=none; b=NSPMpeaWMQpZKkGB9RrPpZ+SLD/kNay2rykkdwKKiSd07uAMqDSi1Qrh9cCpx6EeAS/9NahMbBFmGV9YONPNtnzulq+tKA5or8nwJHEHvmE3s3r/zKYa6bFA8/hdTpsldtPysL+EEhZAyxKMBoT9h2B13DVFC+/ZnXXT4xTgf2Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705573375; c=relaxed/simple; bh=1dw8XttQcgvvpLrWfd8NAiF4saouaKy9KYt8Nf9uJzw=; h=Received:Received:DKIM-Signature:DKIM-Signature:X-ME-Sender: X-ME-Received:X-ME-Proxy-Cause:X-ME-Proxy:Feedback-ID:Received: Received:Date:From:To:Cc:Subject:Message-ID:References: MIME-Version:Content-Type:Content-Disposition:In-Reply-To; b=V/wpjHCmIpl/wLjRs9wnvMLIrP4josQ/UkUXrGqdz/ItU1zbOlNgH/I+wxDitP+wqX9Y7XzF+LFwt877XrpOS/bFPLtjq/SzYEEJPV7HMMbjKkfaEhdWkoqa4M6AoofWI5lRGJHJ8rxjS5Bn22b1cBWEAw1HHbSWbZRBSXmQPTI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none 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=Sp2iNF92; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=R4uawXAF; arc=none smtp.client-ip=64.147.123.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none 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="Sp2iNF92"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="R4uawXAF" Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.west.internal (Postfix) with ESMTP id B1E2A3200A90; Thu, 18 Jan 2024 05:22:52 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Thu, 18 Jan 2024 05:22:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :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=fm3; t=1705573372; x=1705659772; bh=vbcFXvjTjO 7bPTDQcPDwJjqzq1m40ggdji1KeIr0XMg=; b=Sp2iNF92UQ202DTpOV0+n5NspX EtjHgIw1rh0vmDZOQ/KOQUCZtzTt0ztLVKslrZNPuSRQOnd8wTGw9t9j7Drz3pGT F2+/Ce5HoO5UOmXmdITFsDUSbfeEMgFAk19h8JdSezHLX2JS0mlfHbgkuXct849k +DfgALt4sjOfMRWk29HQYzRepfATMG+lMxIBPHfzXXTq/UCjP7xe10jL6HJ1KGPh kfvMx8c6Jopv5NlQlM53EHmEe+YB61soMvKFWQeG50jUTGzlmuU7oNPpoiLNZhqs dLFWXSgwn5lvha8Potxt0Of2+kMYDOFUCoZcenuGCBnFnnpQmmovtKbBq4mw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc: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-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1705573372; x=1705659772; bh=vbcFXvjTjO7bPTDQcPDwJjqzq1m4 0ggdji1KeIr0XMg=; b=R4uawXAFRNW1katJSpewAFWSUPXoBhi2QeAQfVyOk1w/ 2P2w7klEqD6g37BVxpOXM9+AkcbQkehtnCI8YMJhrEsUivbEnC5JjU8X/sZRbYqD sBDf7x017ZQHosAvm7FrLXWvAv/5k8dy++FKiz4Qs1j7r8Bcj7tFX9sD/g9cwyTK w/UbO/BK6uxcxpsttpBBJgBVyAisYwysjPx97Xh2sfDwsT7Sx/j6o1yk59SpNTkZ efFk2UCM4W3EAHoY69xuq9KmrLMzA6p6uaT/JLGmMRNk9fJf/4OzFp3uOLhSdz48 zyRRv9zowXkzrgtBDpiyt4PyVuV71PQMLDlP/IQrQw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdejjedgudehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesghdtreertddtvdenucfhrhhomheprfgrthhr ihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvg hrnhepueektdevtdffveeljeetgfehheeigeekleduvdeffeeghefgledttdehjeelffet necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhsse hpkhhsrdhimh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 18 Jan 2024 05:22:51 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 8acc12ab (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 18 Jan 2024 10:19:56 +0000 (UTC) Date: Thu, 18 Jan 2024 11:22:49 +0100 From: Patrick Steinhardt To: git@vger.kernel.org Cc: Phillip Wood , Matthias =?iso-8859-1?q?A=DFha?= =?iso-8859-1?q?uer?= Subject: [PATCH v2 2/5] Makefile: detect new Homebrew location for ARM-based Macs Message-ID: <32d8bd1d783b3f9f2bc31b8a4b3e9de2d13f6b87.1705573336.git.ps@pks.im> References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: With the introduction of the ARM-based Macs the default location for Homebrew has changed from "/usr/local" to "/opt/homebrew". We only handle the former location though, which means that unless the user has manually configured required search paths we won't be able to locate it. Improve upon this by adding relevant paths to our CFLAGS and LDFLAGS as well as detecting the location of msgfmt(1). Signed-off-by: Patrick Steinhardt --- config.mak.uname | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/config.mak.uname b/config.mak.uname index 3bb03f423a..dacc95172d 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -158,6 +158,19 @@ ifeq ($(uname_S),Darwin) ifeq ($(shell test -x /usr/local/opt/gettext/bin/msgfmt && echo y),y) MSGFMT = /usr/local/opt/gettext/bin/msgfmt endif + # On newer ARM-based machines the default installation path has changed to + # /opt/homebrew. Include it in our search paths so that the user does not + # have to configure this manually. + # + # Note that we do not employ the same workaround as above where we manually + # add gettext. The issue was fixed more than three years ago by now, and at + # that point there haven't been any ARM-based Macs yet. + else ifeq ($(shell test -d /opt/homebrew/ && echo y),y) + BASIC_CFLAGS += -I/opt/homebrew/include + BASIC_LDFLAGS += -L/opt/homebrew/lib + ifeq ($(shell test -x /opt/homebrew/bin/msgfmt && echo y),y) + MSGFMT = /opt/homebrew/bin/msgfmt + endif endif # The builtin FSMonitor on MacOS builds upon Simple-IPC. Both require From patchwork Thu Jan 18 10:22:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13522673 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (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 9324F219FC for ; Thu, 18 Jan 2024 10:22:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.123.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705573379; cv=none; b=Evn9aFigc7Be1b3RpchGqwoRxyJxNvoeHAjXFYzOcTD0q2Dm6A/d+BKvsEcGrWSK5Byn+rryGtqJW0WRzHzjR/W8SXJAP0AL2ns8CWLUyfdEnnMxRR00zaclWrem35Jw9NKYVv7lj6wKLw5jtripQi/wuIB8zIQRwOA0HbkSgmw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705573379; c=relaxed/simple; bh=dZAjkAUMwBoWGGV7FsLgpLqAFGHkgBsnB0MRMeWh8oU=; h=Received:Received:DKIM-Signature:DKIM-Signature:X-ME-Sender: X-ME-Received:X-ME-Proxy-Cause:X-ME-Proxy:Feedback-ID:Received: Received:Date:From:To:Cc:Subject:Message-ID:References: MIME-Version:Content-Type:Content-Disposition:In-Reply-To; b=kTZDmILkx1bO9rT802AX1xDGCJDBPt1V9HEPbnsF5e+nzGk7bGLGfCbiH4AGCi8u7ewDa0SaegcaLgaNQ8ScPWJ+eJ+tSJpYUXlF7nbuZjmiOS4InLddD9mTecwcl/PoUeNk6QgIorC6ymf4G+6kotSVvkFSIWnm0VSvMnDvHJw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none 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=CX5sC8CL; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=JjTWcR6d; arc=none smtp.client-ip=64.147.123.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none 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="CX5sC8CL"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="JjTWcR6d" Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id B78963200BD7; Thu, 18 Jan 2024 05:22:56 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 18 Jan 2024 05:22:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :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=fm3; t=1705573376; x=1705659776; bh=dZAjkAUMwB oWGGV7FsLgpLqAFGHkgBsnB0MRMeWh8oU=; b=CX5sC8CL1VMAWl3bNqPDydDh1p /gpDTNP4cw9cVx4YVj52ijZarDS2dfyT/76Q3MFSfnf3LF23HH/TXEy8a0Dt9maF b+w/sowUZx9/ZR0Few9HB9IG8Y/D0Qk+uRhgjSziubzNUnxKIewfGS3Lkebmbdu+ muZcFivWhwB3BHZbdCIqP/1SJ4bro5xd9KxHrd3xHMlN9ZgYWf28j2StHuDalaY0 uHlB8nS+BTHcbCwIJIZaogAE62Po7lN8QmD63rRLYLnoBnmH2o94IEl2O4lTEYkd 47AU7+ypWESvo0O1TkO7TAMfCVopIh4jUyB7jtyaws98z2GQuyfI6EZR5fkw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc: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-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1705573376; x=1705659776; bh=dZAjkAUMwBoWGGV7FsLgpLqAFGHk gBsnB0MRMeWh8oU=; b=JjTWcR6d0MNdL9XVva8YOJemx68uA3gApOlh/bd/UaPk Tv2a6LBvyY0Mq+ghQgAXjfownXTlX0SFYQ6IMHnbMyVEveJB2PDsVlsMbvw8k/0w OPzIdtCv3x6NH50NyCewc7KIRyLYOTGimreE39rPNgfAowUsMWuLulNGHboBb8Ga Fj+suplQ1gUxNoF2u5c4WujGVg9D1pCx3tH4JNTOiyXk360ZdFkg68cZEPphqCWg BUr/QO9k669fJHFgtTgNINtOAsKHhSR0rWLneIemoBbbuKfC7nz4c0kUvgBpDGY+ 8l//xWtngWc9dwuRIQsqR2mrVARAdrCDRYdpyQRKkw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdejjedgudehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesghdtreertddtvdenucfhrhhomheprfgrthhr ihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvg hrnhepueektdevtdffveeljeetgfehheeigeekleduvdeffeeghefgledttdehjeelffet necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhsse hpkhhsrdhimh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 18 Jan 2024 05:22:55 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 65883b13 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 18 Jan 2024 10:20:00 +0000 (UTC) Date: Thu, 18 Jan 2024 11:22:53 +0100 From: Patrick Steinhardt To: git@vger.kernel.org Cc: Phillip Wood , Matthias =?iso-8859-1?q?A=DFha?= =?iso-8859-1?q?uer?= Subject: [PATCH v2 3/5] ci: handle TEST_OUTPUT_DIRECTORY when printing test failures Message-ID: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: The TEST_OUTPUT_DIRECTORY environment variable can be used to instruct the test suite to write test data and test results into a different location than into "t/". The "ci/print-test-failures.sh" script does not know to handle this environment variable though, which means that it will search for test results in the wrong location if it was set. Update the script to handle TEST_OUTPUT_DIRECTORY so that we can start to set it in our CI. Signed-off-by: Patrick Steinhardt --- ci/print-test-failures.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/print-test-failures.sh b/ci/print-test-failures.sh index c33ad4e3a2..b1f80aeac3 100755 --- a/ci/print-test-failures.sh +++ b/ci/print-test-failures.sh @@ -8,7 +8,7 @@ # Tracing executed commands would produce too much noise in the loop below. set +x -cd t/ +cd "${TEST_OUTPUT_DIRECTORY:-t/}" if ! ls test-results/*.exit >/dev/null 2>/dev/null then From patchwork Thu Jan 18 10:22:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13522674 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (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 B2F1B224CD for ; Thu, 18 Jan 2024 10:23:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.123.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705573384; cv=none; b=j3aXfKxfMxCGZpWrGbnv2M1i7VZTG4j5LEbVTRy73lSlY6+oC2Vvd8kFu1gDlK0TTfw+AO39F6iQl+EEzs1yGml71Cg6pMcgp7QOwX+U+HP9MWlCfLRvAetifCsk7TokP3yzI20UVYTkn8sWPCoTaDORg6Vy5IfjYNDUK6ZRZ5s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705573384; c=relaxed/simple; bh=jtEApcyCy4gWkc+H9OkINLjkLZiRO7wXKiK/9lZOL8s=; h=Received:Received:DKIM-Signature:DKIM-Signature:X-ME-Sender: X-ME-Received:X-ME-Proxy-Cause:X-ME-Proxy:Feedback-ID:Received: Received:Date:From:To:Cc:Subject:Message-ID:References: MIME-Version:Content-Type:Content-Disposition:In-Reply-To; b=ncL7L2TgiCpRtMdetOBue4T5iY3PdLCP9nbWiCpTp22TzLpV/Qpb8YgZmSXcrI/yU8J80TA9evmtZ9njWGoLHalbJHdfh81pezaHAK9yPS9H7G+yuzrETJsrPjST5vtsNmpn2/ylJS7CUWSvEbnixIFa31boGJJniZSHCBRnzTw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none 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=CXbEk5/9; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=kAIN898d; arc=none smtp.client-ip=64.147.123.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none 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="CXbEk5/9"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="kAIN898d" Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id B6DBD3200BDB; Thu, 18 Jan 2024 05:23:01 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Thu, 18 Jan 2024 05:23:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :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=fm3; t=1705573381; x=1705659781; bh=0AazXY0eKQ 7iE2j861NOgMBgbQCXbsFGrcf/v5ZaITA=; b=CXbEk5/9B558Fw541pylCpXYne 6yqlVqqXX27Gbsyny0a8cLEnhfWGXT9NjXuu/zuAU3UzTDKZUQswHTd3e04TNUbC ik4+lXKEe11rBxQbewJNnSK7tBTLuREYMsE3A5ZV/WZSv1uu0SOPXho6dqiOJY0g 8y3uoby1DYragdhE/i1Cssoj7TIqxESeJpH2KBpR5krPu4gWmApcNsNRnEDlKB8e +lueRxaO7BxFWQOFCot019imviabSb9quuuZGN4C74bo2T2++r9QliO2C5nX1flP IM782Kdp0U8WgL6rIHebFjqx/wMEmVRSLYvpnVkwI/Ol0BQ+wpX2VejZmNpg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc: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-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1705573381; x=1705659781; bh=0AazXY0eKQ7iE2j861NOgMBgbQCX bsFGrcf/v5ZaITA=; b=kAIN898dFQT+jE8OWcaXo/Jk/tqkKH+CUOIGzLvCTuXV l1Ib5zXT9dSb/PAyTKsu2LIy/a5Hv42xkGOmbhG1y4xslUQlgG+IrQJk+9TokIVK dUrIKBNIOuj/aDdYcUYaJefZfNu4BHmzc//jc1AnlivcMpgBA37QdyNaK2SMOhUq SRXQoH3Lnub5oFAtaY/ytrgVLCodQgJdnrJwjhIDwiPtTtJzBfyGq/T3246oYgZT 1TLluE3CdCu818/V/gWTKt9i3JmMs/JwtcPE6e6+y6Yz0SmUNsAEnfrRJZeJd1uZ H3bBXRzAi7o0WF0h4QdyOZ6QvSZg8Izh2kcZX5au6w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdejjedgudehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesghdtreertddtvdenucfhrhhomheprfgrthhr ihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvg hrnhepueektdevtdffveeljeetgfehheeigeekleduvdeffeeghefgledttdehjeelffet necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhsse hpkhhsrdhimh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 18 Jan 2024 05:23:00 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 3bd009d4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 18 Jan 2024 10:20:04 +0000 (UTC) Date: Thu, 18 Jan 2024 11:22:58 +0100 From: Patrick Steinhardt To: git@vger.kernel.org Cc: Phillip Wood , Matthias =?iso-8859-1?q?A=DFha?= =?iso-8859-1?q?uer?= Subject: [PATCH v2 4/5] ci: make p4 setup on macOS more robust Message-ID: <1ed6e6865014b5f24aeadd14505b06a15ed20eb2.1705573336.git.ps@pks.im> References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: When setting up Perforce on macOS we put both `p4` and `p4d` into "$HOME/bin". On GitHub CI this directory is indeed contained in the PATH environment variable and thus there is no need for additional setup than to put the binaries there. But GitLab CI does not do this, and thus our Perforce-based tests would be skipped there even though we download the binaries. Refactor the setup code to become more robust by downloading binaries into a separate directory which we then manually append to our PATH. This matches what we do on Linux-based jobs. Note that it may seem like we already did append "$HOME/bin" to PATH because we're actually removing the lines that adapt PATH. But we only ever adapted the PATH variable in "ci/install-dependencies.sh", and didn't adapt it when running "ci/run-build-and-test.sh". Consequently, the required binaries wouldn't be found during the test run unless the CI platform already had the "$HOME/bin" in PATH right from the start. Signed-off-by: Patrick Steinhardt --- ci/install-dependencies.sh | 10 ++++------ ci/lib.sh | 3 +++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 4f407530d3..b4e22de3cb 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -37,15 +37,13 @@ macos-*) test -z "$BREW_INSTALL_PACKAGES" || brew install $BREW_INSTALL_PACKAGES brew link --force gettext - mkdir -p $HOME/bin - ( - cd $HOME/bin + + mkdir -p "$P4_PATH" + pushd "$P4_PATH" wget -q "$P4WHENCE/bin.macosx1015x86_64/helix-core-server.tgz" && tar -xf helix-core-server.tgz && sudo xattr -d com.apple.quarantine p4 p4d 2>/dev/null || true - ) - PATH="$PATH:${HOME}/bin" - export PATH + popd if test -n "$CC_PACKAGE" then diff --git a/ci/lib.sh b/ci/lib.sh index c749b21366..f631206a44 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -344,6 +344,9 @@ macos-*) then MAKEFLAGS="$MAKEFLAGS APPLE_COMMON_CRYPTO_SHA1=Yes" fi + + P4_PATH="$HOME/custom/p4" + export PATH="$P4_PATH:$PATH" ;; esac From patchwork Thu Jan 18 10:23:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13522675 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) (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 AAD1D22613 for ; Thu, 18 Jan 2024 10:23:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=64.147.123.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705573388; cv=none; b=rUdgwp2t3nOVkrf0Y1CBEJPAyivv12LNZqzwtIo59rSkuNKTbt1fkoKrKYlVLRmys2xU7GCv5FMOSKwvHSZJPxHyZbYupjXXXZaWEJvZ5AvShZUfBe1KIVUFw8GdXM+ciHNf96ZKMoG5tpvONfvnHTUxgIZJCXkuLlP5ve2QZ3o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705573388; c=relaxed/simple; bh=7pHbbzZg7kX0m8nc//BearcYPIaFRhYE7wVpc4vvtqE=; h=Received:Received:DKIM-Signature:DKIM-Signature:X-ME-Sender: X-ME-Received:X-ME-Proxy-Cause:X-ME-Proxy:Feedback-ID:Received: Received:Date:From:To:Cc:Subject:Message-ID:References: MIME-Version:Content-Type:Content-Disposition:In-Reply-To; b=qp1m/OAL02LtIa66K2LtcLXgTd9E+VDBRBQ1xLQP0QzZL2n+G7W2zys48z/MXE7+uueXVHkOVON6GTHaYHqTSQItadFPYKoR8wj7gwnoT3OCkqrff7ZObMpmAprv3K3k+Kvvwig22Tc30NofmlwDpmN81Yn1uAP4pfKxsFDfw6g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none 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=H6oESb6i; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=H/csWmiH; arc=none smtp.client-ip=64.147.123.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none 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="H6oESb6i"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="H/csWmiH" Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id B76913200BE1; Thu, 18 Jan 2024 05:23:05 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 18 Jan 2024 05:23:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :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=fm3; t=1705573385; x=1705659785; bh=pgWnYFYJkZ 8tUzjYD0ERLTOraaVhZcWJp0mKKtPgsUU=; b=H6oESb6iSg+t0nh2fHObZmNhuS ucCfCJOkGiwv7zK8O2mrUwrICA+RGhsx6xPdYdM06khH6V2wSeVocKo7oQAglZ5r jmIl3gRs6h97Ha1Y+XA6JnQgqylbNlvboVso9kFa+JNA/LNz33Y52Q1d0z6VAbku 5lU0GjYHGtDJgp+hJc3OTxX13CblBnYx42f72I+yjMK7i1J6TbebX9hbQSag34V6 6cjHjFWET0yf+c4bqt+X+4WLe4YNFFGpQ/pZwZL9qmj8Ta6YMNF/1VPbFWkT05Gr c0gIOVKKJDPlOB1Dz8wnIsJJhS+m/a2bzZamh3wfVEi5klAJ4C//Rl2NwGmQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc: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-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1705573385; x=1705659785; bh=pgWnYFYJkZ8tUzjYD0ERLTOraaVh ZcWJp0mKKtPgsUU=; b=H/csWmiH9dTocSfz59ofDcpuOdTaddlO47J7od54mNYh jw4nIJKzz7Vc/aCZhaD9T1NpskV7AsM3jkT8OdolSq7eDuHHT5/rZeupHTSdym6u TEhY0jZaDuhKLxIrEIk7gJTTgVHx9DGqAx6iexTZ6omvUf1UYLXfWqpuSsEUx40u oyf6gz2COyJYwd2NdxWHt9NrPfyZwZkBQN2lDEw/pRORdvvRShZTn8HCk18NQlMP tZBv+RLmwdgxogFsCHPuG8skueJ49kFq29TguECS1cTvygNjtIpc6bd2pmJsVLAH gfPcMJhOva4MIeWLnXgmmv+isACwR7bguItzGgsi3Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdejjedgudehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesghdtreertddtvdenucfhrhhomheprfgrthhr ihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvg hrnhepueektdevtdffveeljeetgfehheeigeekleduvdeffeeghefgledttdehjeelffet necuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehmrghilhhfrhhomhepphhsse hpkhhsrdhimh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 18 Jan 2024 05:23:04 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id a5be2654 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 18 Jan 2024 10:20:08 +0000 (UTC) Date: Thu, 18 Jan 2024 11:23:02 +0100 From: Patrick Steinhardt To: git@vger.kernel.org Cc: Phillip Wood , Matthias =?iso-8859-1?q?A=DFha?= =?iso-8859-1?q?uer?= Subject: [PATCH v2 5/5] ci: add macOS jobs to GitLab CI Message-ID: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Add a job to GitLab CI which runs tests on macOS, which matches the equivalent "osx-clang" job that we have for GitHub Workflows. One significant difference though is that this new job runs on Apple M1 machines and thus uses the "arm64" architecture. As GCC does not yet support this comparatively new architecture we cannot easily include an equivalent for the "osx-gcc" job that exists in GitHub Workflows. Note that one test marked as `test_must_fail` is surprisingly passing: t7815-grep-binary.sh (Wstat: 0 Tests: 22 Failed: 0) TODO passed: 12 This seems to boil down to an unexpected difference in how regcomp(3P) works when matching NUL bytes. Cross-checking with the respective GitHub job shows that this is not an issue unique to the GitLab CI job as it passes in the same way there. Signed-off-by: Patrick Steinhardt --- .gitlab-ci.yml | 34 +++++++++++++++++++++++++++++++++- ci/lib.sh | 9 ++++++++- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 793243421c..43bfbd8834 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ workflow: - if: $CI_COMMIT_TAG - if: $CI_COMMIT_REF_PROTECTED == "true" -test: +test:linux: image: $image before_script: - ./ci/install-docker-dependencies.sh @@ -52,6 +52,38 @@ test: - t/failed-test-artifacts when: on_failure +test:osx: + image: $image + tags: + - saas-macos-medium-m1 + variables: + TEST_OUTPUT_DIRECTORY: "/Volumes/RAMDisk" + before_script: + # Create a 4GB RAM disk that we use to store test output on. This small hack + # significantly speeds up tests by more than a factor of 2 because the + # macOS runners use network-attached storage as disks, which is _really_ + # slow with the many small writes that our tests do. + - sudo diskutil apfs create $(hdiutil attach -nomount ram://8192000) RAMDisk + - ./ci/install-dependencies.sh + script: + - ./ci/run-build-and-tests.sh + after_script: + - | + if test "$CI_JOB_STATUS" != 'success' + then + ./ci/print-test-failures.sh + mv "$TEST_OUTPUT_DIRECTORY"/failed-test-artifacts t/ + fi + parallel: + matrix: + - jobname: osx-clang + image: macos-13-xcode-14 + CC: clang + artifacts: + paths: + - t/failed-test-artifacts + when: on_failure + static-analysis: image: ubuntu:22.04 variables: diff --git a/ci/lib.sh b/ci/lib.sh index f631206a44..d5dd2f2697 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -252,7 +252,14 @@ then CI_COMMIT="$CI_COMMIT_SHA" case "$CI_JOB_IMAGE" in macos-*) - CI_OS_NAME=osx;; + # GitLab CI has Python installed via multiple package managers, + # most notably via asdf and Homebrew. Ensure that our builds + # pick up the Homebrew one by prepending it to our PATH as the + # asdf one breaks tests. + export PATH="$(brew --prefix)/bin:$PATH" + + CI_OS_NAME=osx + ;; alpine:*|fedora:*|ubuntu:*) CI_OS_NAME=linux;; *)