Merge pull request #18 from donaldwasserman/master

Provide fallback PR branch in some cases
nextreleaseio · May 18, 2020 · 85a47ed · 85a47ed
2 parents 8db8653 + 3edcef6
commit 85a47ed
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -536,7 +536,9 @@ async function run() {
     changelogExists = false;
   }
 
-  let { url, tag, name, body, releaseBranch } = getReleaseData(eventPath);
+  let { url, tag, name, body, releaseBranch, repoDefaultBranch } = getReleaseData(
+    eventPath
+  );
 
   let branch = defaultBranch || releaseBranch;
 
@@ -559,6 +561,10 @@ async function run() {
 
   let prBranch = core.getInput('branch_name') || `changelog-${tag}`;
 
+  if (!prBranch) {
+    prBranch = repoDefaultBranch;
+  }
+
   if (usePr) {
     let refSha;
     try {
@@ -618,7 +624,8 @@ function getReleaseData(eventPath) {
     target_commitish: releaseBranch
   } = event.release;
 
-  return { url, tag, name, body, releaseBranch };
+  let { default_branch: repoDefaultBranch } = event.repository;
+  return { url, tag, name, body, releaseBranch, repoDefaultBranch };
 }
 
 run();

diff --git a/index.js b/index.js
@@ -42,7 +42,9 @@ async function run() {
     changelogExists = false;
   }
 
-  let { url, tag, name, body, releaseBranch } = getReleaseData(eventPath);
+  let { url, tag, name, body, releaseBranch, repoDefaultBranch } = getReleaseData(
+    eventPath
+  );
 
   let branch = defaultBranch || releaseBranch;
 
@@ -65,6 +67,10 @@ async function run() {
 
   let prBranch = core.getInput('branch_name') || `changelog-${tag}`;
 
+  if (!prBranch) {
+    prBranch = repoDefaultBranch;
+  }
+
   if (usePr) {
     let refSha;
     try {
@@ -124,7 +130,8 @@ function getReleaseData(eventPath) {
     target_commitish: releaseBranch
   } = event.release;
 
-  return { url, tag, name, body, releaseBranch };
+  let { default_branch: repoDefaultBranch } = event.repository;
+  return { url, tag, name, body, releaseBranch, repoDefaultBranch };
 }
 
 run();