From de8dc021f99d03a18a1950f4c6acbd8e5f74ead7 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sun, 2 Oct 2022 09:37:08 +0000 Subject: [PATCH] fix: pr branches --- apps/api/src/routes/webhooks/github/handlers.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/api/src/routes/webhooks/github/handlers.ts b/apps/api/src/routes/webhooks/github/handlers.ts index 3568e3ab5..215d3ec69 100644 --- a/apps/api/src/routes/webhooks/github/handlers.ts +++ b/apps/api/src/routes/webhooks/github/handlers.ts @@ -80,7 +80,7 @@ export async function gitHubEvents(request: FastifyRequest): Promi branch = body.ref.includes('/') ? body.ref.split('/')[2] : body.ref; } else if (githubEvent === 'pull_request') { projectId = body.pull_request.base.repo.id; - branch = body.pull_request.base.ref.includes('/') ? body.pull_request.base.ref.split('/')[2] : body.pull_request.base.ref; + branch = body.pull_request.base.ref } if (!projectId || !branch) { throw { status: 500, message: 'Cannot parse projectId or branch from the webhook?!' } @@ -147,7 +147,7 @@ export async function gitHubEvents(request: FastifyRequest): Promi } else if (githubEvent === 'pull_request') { const pullmergeRequestId = body.number.toString(); const pullmergeRequestAction = body.action; - const sourceBranch = body.pull_request.head.ref.includes('/') ? body.pull_request.head.ref.split('/')[2] : body.pull_request.head.ref; + const sourceBranch = body.pull_request.head.ref const sourceRepository = body.pull_request.head.repo.full_name if (!allowedActions.includes(pullmergeRequestAction)) { throw { status: 500, message: 'Action not allowed.' }