fix: use current branch calculator

intuit · Oct 21, 2021 · 4cffcdd · 4cffcdd
1 parent d4ade35
commit 4cffcdd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/packages/core/src/auto.ts b/packages/core/src/auto.ts
@@ -1685,9 +1685,7 @@ export default class Auto {
     options: IShipItOptions
   ): Promise<ShipitInfo | undefined> {
     const latestTag = await this.git?.getLatestTagInBranch(
-      env.branch ||
-      getCurrentBranch() ||
-      ""
+      getCurrentBranch() || ""
     );
     const result = await this.publishFullRelease({
       ...options,

diff --git a/packages/core/src/utils/get-current-branch.ts b/packages/core/src/utils/get-current-branch.ts
@@ -3,16 +3,21 @@ import { execSync } from "child_process";
 
 const env = envCi();
 
+/**
+ *
+ */
+const isValidBranch = (branch: string | undefined) => typeof branch === "string" && branch !== "undefined"
+
 /** Get the current branch the git repo is set to */
 export function getCurrentBranch() {
   const isPR = "isPr" in env && env.isPr;
   let branch: string | undefined;
   // env-ci sets branch to target branch (ex: main) in some CI services.
   // so we should make sure we aren't in a PR just to be safe
 
-  if (isPR && "prBranch" in env) {
+  if (isPR && "prBranch" in env && isValidBranch(env.prBranch)) {
     branch = env.prBranch;
-  } else {
+  } else if(isValidBranch(env.branch)) {
     branch = env.branch;
   }