Skip to content

Commit 6602158

Browse files
authored
Check for existence of backport branch before trying to create it (#125)
1 parent e863e8b commit 6602158

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

src/github.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,15 +245,24 @@ export const backportPrExists = async (
245245
pr: { number: number },
246246
giteaMajorMinorVersion: string,
247247
) => {
248-
const response = await fetch(
248+
let response = await fetch(
249249
`${GITHUB_API}/search/issues?q=` +
250250
encodeURIComponent(
251251
`is:pr is:open repo:go-gitea/gitea base:release/v${giteaMajorMinorVersion} ${pr.number} in:title`,
252252
),
253253
{ headers: HEADERS },
254254
);
255255
const json = await response.json();
256-
return json.total_count > 0;
256+
if (json.total_count > 0) return true;
257+
258+
// also check if a branch that looks like the backport branch (getPrBranchName) exists
259+
response = await fetch(
260+
`${GITHUB_API}/repos/${Deno.env.get("BACKPORTER_GITEA_FORK")}/branches/${
261+
getPrBranchName(pr.number, giteaMajorMinorVersion)
262+
}`,
263+
{ headers: HEADERS },
264+
);
265+
return response.ok;
257266
};
258267

259268
type Milestone = { title: string; number: number };

0 commit comments

Comments
 (0)