From patchwork Thu Jun 6 09:31:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13688192 Received: from fout5-smtp.messagingengine.com (fout5-smtp.messagingengine.com [103.168.172.148]) (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 126CF178395 for ; Thu, 6 Jun 2024 09:31:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.148 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717666313; cv=none; b=joMkA+/2JVR/H1Q7YdcPefQQjgRIC17s4A5sqFswJ3EUft5AxvvWqXmQSxFUtlXGKCTfYTLPjcTNgiy4FxWcFC5dYE3CdBS0fBK2rJCAwkM8/siJi9F8/XsJaWQ7klvmL0Xs3OZXeTYJtJ/V5SuKvAemcX62mdFMU8KIRoH1Ozk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717666313; c=relaxed/simple; bh=s3O5p1J+UeQ2khwD8/2s030Pm2VUsZVJewLFqLgUeV0=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=q9ayaDWKJLDUTFGWVfpeR+4XhIAK4FFs8XLh1AKtAHlwVtTKM5cv5/K564QvYL+rQZKG5midZOoikm6xmlMDWhyCp1I9kz8oKScxcfW7yPPtv+qKI5zGv1X8uQlB5oCmNvoaOWwPDPPp77NFfMgueVA+4jI1pJ3yJVtZ0mDGvc8= 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=Ra9qrPoo; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=TNZdbCs7; arc=none smtp.client-ip=103.168.172.148 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="Ra9qrPoo"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="TNZdbCs7" Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfout.nyi.internal (Postfix) with ESMTP id 0B9C5138011C; Thu, 6 Jun 2024 05:31:51 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Thu, 06 Jun 2024 05:31:51 -0400 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=fm1; t=1717666311; x=1717752711; bh=WFEJpE1oKw dgbR8KuQo+mk+YjsJ0gJJallABHnqOPf0=; b=Ra9qrPooez3oEqDrm6N6QVlLJJ BkP0Fw+OtBSpBNbhxWh2ckN1nDkR6mZEArYXjthx2SOgWEWpt4JZJcdVohystroM dLRMm5BRvNUkc80yRqeM2enQkXDL2LHfh9gPzGgVcT3AOaXddhlZfi4hwH38clJw vHREbYT2UWi6r9mGflTf2tMAO1d8Be+gQ3YT3P0FjQ+UVWNUNFv/5/jlJl8JMeVg agpXXexpmelW60gWnTKAW+qQWgU12ykcmp3hJfh6z66lqdse7mIqjIYeGnlWa/4j +369W6km/u3KMJBtxR+imHna1C9pFvI927/EPryyQkVpjAtmryULjoG3+O6w== 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= fm1; t=1717666311; x=1717752711; bh=WFEJpE1oKwdgbR8KuQo+mk+YjsJ0 gJJallABHnqOPf0=; b=TNZdbCs73q/KJp45BEOjM+chNWuXMxiBemf3bxNJLkGx bLd87GaaP7PgBw/8nzsxY+TVO3+1Wgjop8jroh0vRpASYvslF3lCEA2Xk5DbLYJQ w7yRPnexT2uJ5LXKSInldfUs/GyyDKyZY2zJ9MBlT33AKEn4urIoY6m9efJWw2cL ARYATgnjBaYdolaTPKx2DtYot43DadN1NCwCcTiswlGNg2obTnFsi9QgnvkLbgXy AlevIKE6g8ONJMkbyTOGWqJsT54DRM7NKpHjn5oMN/3ZFGuHgZNlO6WehmtdJ6CR W8w9T1IOnHxxOjaLLjwGEvlpxvJvWXy4+UQEw8/Kuw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdelkedgudeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvvefukfhfgggtuggjsehgtd erredttddvnecuhfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshes phhkshdrihhmqeenucggtffrrghtthgvrhhnpeeukedtvedtffevleejtefgheehieegke eluddvfeefgeehgfeltddtheejleffteenucevlhhushhtvghrufhiiigvpedtnecurfgr rhgrmhepmhgrihhlfhhrohhmpehpshesphhkshdrihhm X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 6 Jun 2024 05:31:49 -0400 (EDT) Received: by localhost (OpenSMTPD) with ESMTPSA id fbc1c5cb (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 6 Jun 2024 09:31:12 +0000 (UTC) Date: Thu, 6 Jun 2024 11:31:40 +0200 From: Patrick Steinhardt To: git@vger.kernel.org Cc: Jeff King , Junio C Hamano Subject: [PATCH v2 1/2] ci: fix check for Ubuntu 20.04 Message-ID: References: <20240606080552.GA658959@coredump.intra.peff.net> 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 5ca0c455f1 (ci: fix Python dependency on Ubuntu 24.04, 2024-05-06), we made the use of Python 2 conditional on whether or not the CI job runs Ubuntu 20.04. There was a brown-paper-bag-style bug though, where the condition forgot to invoke the `test` builtin. The result of it is that the check always fails, and thus all of our jobs run with Python 3 by accident. Fix this. Signed-off-by: Patrick Steinhardt --- ci/lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/lib.sh b/ci/lib.sh index 1f4059b1b8..814578ffc6 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -328,7 +328,7 @@ ubuntu-*) # Python 2 is end of life, and Ubuntu 23.04 and newer don't actually # have it anymore. We thus only test with Python 2 on older LTS # releases. - if "$distro" = "ubuntu-20.04" + if test "$distro" = "ubuntu-20.04" then PYTHON_PACKAGE=python2 else