From 8ebff72cde85e080e254101c4bcce63d9bcd2de5 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 20 Apr 2022 23:02:19 +0200
Subject: [PATCH] fix: Correct branch shown in build logs

---
 .../migrations/20220420210057_branch_for_builds/migration.sql   | 2 ++
 prisma/schema.prisma                                            | 1 +
 src/lib/buildPacks/deno.ts                                      | 1 -
 src/routes/applications/[id]/deploy.json.ts                     | 1 +
 src/routes/applications/[id]/logs/build/index.svelte            | 2 +-
 5 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 prisma/migrations/20220420210057_branch_for_builds/migration.sql

diff --git a/prisma/migrations/20220420210057_branch_for_builds/migration.sql b/prisma/migrations/20220420210057_branch_for_builds/migration.sql
new file mode 100644
index 000000000..8cd8e653d
--- /dev/null
+++ b/prisma/migrations/20220420210057_branch_for_builds/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Build" ADD COLUMN "branch" TEXT;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index ba45770af..abbfe24b2 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -183,6 +183,7 @@ model Build {
   githubAppId         String?
   gitlabAppId         String?
   commit              String?
+  branch              String?
   status              String?  @default("queued")
   createdAt           DateTime @default(now())
   updatedAt           DateTime @updatedAt
diff --git a/src/lib/buildPacks/deno.ts b/src/lib/buildPacks/deno.ts
index 63c734312..2e5569438 100644
--- a/src/lib/buildPacks/deno.ts
+++ b/src/lib/buildPacks/deno.ts
@@ -34,7 +34,6 @@ const createDockerfile = async (data, image): Promise<void> => {
 		Dockerfile.push(`COPY .${baseDirectory || ''}/deps.ts /app`);
 		Dockerfile.push(`RUN deno cache deps.ts`);
 	}
-	console.log(denoOptions && denoOptions.split());
 	Dockerfile.push(`COPY ${denoMainFile} /app`);
 	Dockerfile.push(`RUN deno cache ${denoMainFile}`);
 	Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
diff --git a/src/routes/applications/[id]/deploy.json.ts b/src/routes/applications/[id]/deploy.json.ts
index 59bd7d001..3f645deb2 100644
--- a/src/routes/applications/[id]/deploy.json.ts
+++ b/src/routes/applications/[id]/deploy.json.ts
@@ -35,6 +35,7 @@ export const post: RequestHandler = async (event) => {
 			data: {
 				id: buildId,
 				applicationId: id,
+				branch: applicationFound.branch,
 				destinationDockerId: applicationFound.destinationDocker.id,
 				gitSourceId: applicationFound.gitSource.id,
 				githubAppId: applicationFound.gitSource.githubApp?.id,
diff --git a/src/routes/applications/[id]/logs/build/index.svelte b/src/routes/applications/[id]/logs/build/index.svelte
index b5e0afc1d..0a3499a7b 100644
--- a/src/routes/applications/[id]/logs/build/index.svelte
+++ b/src/routes/applications/[id]/logs/build/index.svelte
@@ -173,7 +173,7 @@
 				>
 					<div class="flex-col px-2">
 						<div class="text-sm font-bold">
-							{application.branch}
+							{build.branch || application.branch}
 						</div>
 						<div class="text-xs">
 							{build.type}