From nobody Mon Feb 9 07:39:00 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 16908839064777.927584648645507; Tue, 1 Aug 2023 02:58:26 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.574031.899232 (Exim 4.92) (envelope-from ) id 1qQm8n-0002J4-6R; Tue, 01 Aug 2023 09:58:09 +0000 Received: by outflank-mailman (output) from mailman id 574031.899232; Tue, 01 Aug 2023 09:58:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qQm8n-0002Iu-3S; Tue, 01 Aug 2023 09:58:09 +0000 Received: by outflank-mailman (input) for mailman id 574031; Tue, 01 Aug 2023 09:58:07 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qQm8l-0000wJ-Fv for xen-devel@lists.xenproject.org; Tue, 01 Aug 2023 09:58:07 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e9cfcd28-3051-11ee-b259-6b7b168915f2; Tue, 01 Aug 2023 11:58:07 +0200 (CEST) Received: from beta.station (net-188-218-251-179.cust.vodafonedsl.it [188.218.251.179]) by support.bugseng.com (Postfix) with ESMTPSA id 733144EE0737; Tue, 1 Aug 2023 11:58:06 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e9cfcd28-3051-11ee-b259-6b7b168915f2 From: Simone Ballarin To: xen-devel@lists.xenproject.org Cc: consulting@bugseng.com, Simone Ballarin , Doug Goldstein , Stefano Stabellini Subject: [XEN PATCH 4/4] automation/eclair: avoid failure in case of missing merge point Date: Tue, 1 Aug 2023 11:57:04 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1690883907434100005 Content-Type: text/plain; charset="utf-8" In the context of an auto pull request, when a common merge point is not found the integration will continue the analysis without failing. Signed-off-by: Simone Ballarin Acked-by: Stefano Stabellini --- automation/eclair_analysis/ECLAIR/action.settings | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/automation/eclair_analysis/ECLAIR/action.settings b/automation= /eclair_analysis/ECLAIR/action.settings index 528bc24c72..f96368ffc7 100644 --- a/automation/eclair_analysis/ECLAIR/action.settings +++ b/automation/eclair_analysis/ECLAIR/action.settings @@ -138,7 +138,9 @@ auto_pull_request) git remote add autoPRRemote "${autoPRRemoteUrl}" git fetch -q autoPRRemote subDir=3D"${ref}" - baseCommitId=3D$(git merge-base "autoPRRemote/${autoPRBranch}" HEAD) + if ! baseCommitId=3D$(git merge-base "autoPRRemote/${autoPRBranch}" HE= AD); then + baseCommitId=3Dno_merge_point + fi jobHeadline=3D"ECLAIR ${ANALYSIS_KIND} on repository ${repository}: ${= pushUser} wants to merge ${repository}:${ref} (${headCommitId}) into ${auto= PRRepository}/${autoPRBranch} (${baseCommitId})" ;; *) --=20 2.34.1