refactor!: don't include the commit sha when pull request reference i…

…s included Signed-off-by: Ardalan Amini <ardalanamini22@gmail.com>
ardalanamini · Apr 29, 2023 · d9c18ae · d9c18ae
1 parent 4538068
commit d9c18ae
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/action/index.js b/action/index.js
diff --git a/action/index.js.map b/action/index.js.map
diff --git a/src/changelog.ts b/src/changelog.ts
@@ -71,6 +71,9 @@ export async function generateChangelog(lastSha?: string): Promise<string> {
   const { owner, repo, url } = repository();
   const defaultType = defaultCommitType();
   const typeMap = commitTypes();
+  const shouldIncludePRLinks = includePRLinks();
+  const shouldIncludeCommitLinks = includeCommitLinks();
+  const shouldMentionAuthors = mentionAuthors();
 
   const iterator = paginate.iterator(
     rest.repos.listCommits,
@@ -142,11 +145,11 @@ export async function generateChangelog(lastSha?: string): Promise<string> {
 
       const reference: string[] = [];
 
-      if (pr && includePRLinks()) reference.push(`${ url }/issues/${ pr }`);
+      if (pr && shouldIncludePRLinks) reference.push(`${ url }/issues/${ pr }`);
 
-      if (includeCommitLinks()) reference.push(`${ url }/commit/${ commit.sha }`);
+      if ((!pr || !shouldIncludePRLinks) && shouldIncludeCommitLinks) reference.push(`${ url }/commit/${ commit.sha }`);
 
-      if (commit.author?.login && mentionAuthors()) reference.push(`by @${ commit.author.login }`);
+      if (commit.author?.login && shouldMentionAuthors) reference.push(`by @${ commit.author.login }`);
 
       if (reference.length > 0) log.references.push(reference.join(" "));
     }