From 67eba56d11ce010da1b3d133f84c1bce423df3d3 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Wed, 3 Apr 2024 19:56:28 +0300 Subject: [PATCH] Check for existence of backport branch before trying to create it Let's try it Signed-off-by: Yarden Shoham --- src/github.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/github.ts b/src/github.ts index 49c489b..ef0a472 100644 --- a/src/github.ts +++ b/src/github.ts @@ -245,7 +245,7 @@ export const backportPrExists = async ( pr: { number: number }, giteaMajorMinorVersion: string, ) => { - const response = await fetch( + let response = await fetch( `${GITHUB_API}/search/issues?q=` + encodeURIComponent( `is:pr is:open repo:go-gitea/gitea base:release/v${giteaMajorMinorVersion} ${pr.number} in:title`, @@ -253,7 +253,16 @@ export const backportPrExists = async ( { headers: HEADERS }, ); const json = await response.json(); - return json.total_count > 0; + if (json.total_count > 0) return true; + + // also check if a branch that looks like the backport branch (getPrBranchName) exists + response = await fetch( + `${GITHUB_API}/repos/${Deno.env.get("BACKPORTER_GITEA_FORK")}/branches/${ + getPrBranchName(pr.number, giteaMajorMinorVersion) + }`, + { headers: HEADERS }, + ); + return response.ok; }; type Milestone = { title: string; number: number };