Fix wrong branch for pull_request builds

Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>
zowe-actions · May 23, 2023 · 0864c3a · 0864c3a
1 parent f1700ea
commit 0864c3a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/dist/core.js b/dist/core.js
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## `1.0.1`
 
+* Fixed wrong branch detected for GitHub Actions `pull_request` builds
 * Fixed Git tags being matched that do not conform to semver
 
 ## `1.0.0`

diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
@@ -171,11 +171,15 @@ export async function getLastCommitMessage(context: IContext): Promise<string |
  * @returns CI environment for the `context.ci` property
  */
 async function loadCiEnv(): Promise<any> {
-    const envCi = require("env-ci")();
+    let envCi = require("env-ci")();
     if (envCi.service == null) {
         throw new Error(`Unsupported CI service detected: ${envCi.service}`);
     }
 
+    if (envCi.isPr) {
+        // For PR builds, map `branch` (base) to `baseBranch` and `prBranch` (head) to `branch`
+        envCi = { ...envCi, baseBranch: envCi.branch, branch: envCi.prBranch, prBranch: undefined };
+    }
     if (envCi.branch == null) {
         const cmdOutput = await exec.getExecOutput("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
         envCi.branch = cmdOutput.stdout.trim();