diff --git a/.auto-changelog b/.auto-changelog index e41248479..358ce99af 100644 --- 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" } \ No newline at end of file diff --git a/.github/workflows/release_beta_to_dev.yaml b/.github/workflows/release_beta_to_dev.yaml index a3f8de1d3..6f7e85098 100644 --- 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