From 74a1ef8d9b9f9e7f62b71e51fc38b47368f9b02e Mon Sep 17 00:00:00 2001
From: Eric Fennis <eric.fennis@gmail.com>
Date: Sun, 11 Apr 2021 01:35:28 +0200
Subject: [PATCH] Fix changelog in workflow

---
 .github/workflows/ci.yml     | 2 +-
 scripts/generateChangelog.js | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e2d101ed4..40457fdeb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,7 +46,7 @@ jobs:
       - name: Create change log
         id: change-log
         run: |
-          CHANGE_LOG=$(yarn generate:changelog --old-tag=${{ steps.new-version.outputs.NEW_VERSION }})
+          CHANGE_LOG=$(yarn generate:changelog --old-tag=${{ steps.latest-tag.outputs.LATEST_TAG }})
           CHANGE_LOG="${CHANGE_LOG//'%'/'%25'}"
           CHANGE_LOG="${CHANGE_LOG//$'\n'/'%0A'}"
           CHANGE_LOG="${CHANGE_LOG//$'\r'/'%0D'}"
diff --git a/scripts/generateChangelog.js b/scripts/generateChangelog.js
index 2a609342d..3cca9e305 100644
--- a/scripts/generateChangelog.js
+++ b/scripts/generateChangelog.js
@@ -47,6 +47,10 @@ const cliArguments = getArgumentOptions(process.argv.slice(2));
 
     const commits = await Promise.all(changedFiles.map(fetchCommits));
 
+    if (!commits.length) {
+      throw new Error('No commits found');
+    }
+
     const mappedCommits = commits
       .map(({ commits: [pr], filename, sha, status }) => {
         const pullNumber = /(.*)\((#[0-9]*)\)/gm.exec(pr.commit.message);
@@ -78,6 +82,6 @@ const cliArguments = getArgumentOptions(process.argv.slice(2));
 
     console.log(changelogMarkown);
   } catch (error) {
-    console.error(error);
+    throw new Error(error);
   }
 })();