From c6043fb4f9cc46d59dea99e88ebae07976b3a87f Mon Sep 17 00:00:00 2001 From: Egor Kurnev Date: Mon, 14 Dec 2020 19:38:42 +0300 Subject: [PATCH] fix: More checks. Fix test for changelog generation --- .github/workflows/test.yml | 1 - src/helpers/git.js | 7 ++++++- src/index.js | 6 ++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a3234b9..1d843b4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -105,7 +105,6 @@ jobs: github-token: ${{ secrets.github_token }} pre-changelog-generation: test/pre-changelog-generation.js version-file: './test-file.toml' - skip-on-empty: 'false' - run: test -f pre-changelog-generation.test.json || (echo should be here && exit 1) - run: cat pre-changelog-generation.test.json diff --git a/src/helpers/git.js b/src/helpers/git.js index 0050143..a2c06af 100644 --- a/src/helpers/git.js +++ b/src/helpers/git.js @@ -127,7 +127,12 @@ module.exports = new (class Git { isShallow = async () => { const isShallow = await this.exec('rev-parse --is-shallow-repository') - return isShallow.trim().replace('\n', '') === 'true' + // isShallow does not return anything on local machine + if (isShallow) { + return isShallow.trim().replace('\n', '') === 'true' + } else { + return false + } } /** diff --git a/src/index.js b/src/index.js index ddeca49..54ffa95 100644 --- a/src/index.js +++ b/src/index.js @@ -118,8 +118,10 @@ async function run() { version: newVersion, }) - gitTag = newVersionAndTag.tag - newVersion = newVersionAndTag.version + if (newVersionAndTag) { + if (newVersionAndTag.tag) gitTag = newVersionAndTag.tag + if (newVersionAndTag.version) newVersion = newVersionAndTag.version + } } // Generate the string changelog