Fix: Fix PR flow on pull_request_target

Olivr · Oct 1, 2020 · ee5bd2a · ee5bd2a
1 parent 4049d86
commit ee5bd2a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/copybaraAction.ts b/src/copybaraAction.ts
@@ -24,12 +24,10 @@ export class CopybaraAction {
 
   getCurrentBranch() {
     if (!this.current.branch) {
-      let ref = "";
-      if (context.payload.pull_request && /^refs\/heads\//.test(context.payload.pull_request.base.ref))
-        ref = context.payload.pull_request.base.ref;
-      else if (/^refs\/heads\//.test(context.ref)) ref = context.ref;
-      else throw `Cannot determine head branch from ${context.payload.base_ref} and ${context.ref}`;
-      this.current.branch = ref.replace(/^refs\/heads\//, "");
+      if (context.payload.pull_request && context.payload.pull_request.base.ref)
+        this.current.branch = context.payload.pull_request.base.ref;
+      else if (/^refs\/heads\//.test(context.ref)) this.current.branch = context.ref.replace(/^refs\/heads\//, "");
+      else throw `Cannot determine head branch from ${context.payload.pull_request?.base.ref} and ${context.ref}`;
     }
     core.debug(`Current branch is ${this.current.branch}`);
     return this.current.branch;