Fix auto generate changelog workflow

Part 6
yell0wsuit · Aug 11, 2024 · b1d148c · b1d148c
1 parent d51bbfe
commit b1d148c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/.github/workflows/offline.yml b/.github/workflows/offline.yml
@@ -79,25 +79,24 @@ jobs:
                       });
 
                       const latestTag = tags.length > 0 ? tags[0].name : null;
-                      const latestTagDate = latestTag && latestTag.commit && latestTag.commit.committer 
-                                  ? new Date(latestTag.commit.committer.date) 
-                                  : null;
 
-                      const { data: commits } = await github.rest.repos.listCommits({
-                        owner: context.repo.owner,
-                        repo: context.repo.repo,
-                        per_page: 100,
-                        sha: 'main',
-                      });
-
-                      const changelog = commits
-                        .filter(commit => latestTagDate ? new Date(commit.commit.author.date) > latestTagDate : true)
-                        .map(commit => `- ${commit.commit.message}`)
-                        .join("\n");
+                      if (latestTag) {
+                        const { data: compare } = await github.rest.repos.compareCommits({
+                          owner: context.repo.owner,
+                          repo: context.repo.repo,
+                          base: latestTag,
+                          head: 'main',
+                        });
 
-                      const finalChangelog = changelog || 'No significant changes.';
+                        const changelog = compare.commits
+                          .map(commit => `- ${commit.commit.message}`)
+                          .join("\n");
 
-                      core.setOutput('changelog', finalChangelog);
+                        const finalChangelog = changelog || 'No significant changes.';
+                        core.setOutput('changelog', finalChangelog);
+                      } else {
+                        core.setOutput('changelog', 'No previous tags found.');
+                      }
 
             - name: Create GitHub release
               id: create_release
@@ -108,4 +107,4 @@ jobs:
                   tag_name: ${{ env.latest_tag }}
                   name: v${{ env.PACKAGE_VERSION }}
                   body: ${{ steps.generate_changelog.outputs.changelog }}
-                  files: docusaurus-offline-site-v${{ env.PACKAGE_VERSION }}.zip
+                  files: docugrammar-offline-v${{ env.PACKAGE_VERSION }}.zip
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "docugrammar",
-    "version": "3.1.9",
+    "version": "3.1.10",
     "private": true,
     "scripts": {
         "docusaurus": "docusaurus",