On Tue, 1 Aug 2023, Simone Ballarin wrote: > 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 <[email protected]>
Acked-by: Stefano Stabellini <[email protected]> > --- > 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="${ref}" > - baseCommitId=$(git merge-base "autoPRRemote/${autoPRBranch}" HEAD) > + if ! baseCommitId=$(git merge-base "autoPRRemote/${autoPRBranch}" HEAD); > then > + baseCommitId=no_merge_point > + fi > jobHeadline="ECLAIR ${ANALYSIS_KIND} on repository ${repository}: > ${pushUser} wants to merge ${repository}:${ref} (${headCommitId}) into > ${autoPRRepository}/${autoPRBranch} (${baseCommitId})" > ;; > *) > -- > 2.34.1 >
