no log: Improved release exclude regex that could be fixing empty cha…

…nges log issue.
morpheus65535 · Jul 1, 2021 · f125845 · f125845
1 parent cb623c3
commit f125845
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.auto-changelog b/.auto-changelog
@@ -1,5 +1,5 @@
 {
   "template": "./changelog-dev.hbs",
-  "ignoreCommitPattern": "^(Release|no log:).*",
+  "ignoreCommitPattern": "^(Release|no log:|Merge.remote-tracking).*",
   "sortCommits": "date-desc"
 }
diff --git a/.github/workflows/release_beta_to_dev.yaml b/.github/workflows/release_beta_to_dev.yaml
@@ -63,7 +63,7 @@ jobs:
       - name: Create Release (Conditional)
         if: ${{ steps.check-ci.outputs.conclusion == 'success' }}
         run: |
-          revision_count=$(git rev-list --invert-grep --regexp-ignore-case --extended-regexp --grep="^(Release|no log:).*" $(git describe --tags --abbrev=0)..HEAD --count)
+          revision_count=$(git rev-list --invert-grep --regexp-ignore-case --extended-regexp --grep="^(Release|no log:|Merge.remote-tracking).*" $(git describe --tags --abbrev=0)..HEAD --count)
           if [[ $revision_count != 0 ]]; then
             echo "**** Found $revision_count changes! Releasing... ****"
             release-it --ci --increment prerelease --preRelease=beta