diff --git a/.circleci/config.yml b/.circleci/config.yml index 0ff9559365e..3093b28d43d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -96,6 +96,15 @@ jobs: workflows: version: 2 release: + when: + and: + - matches: + pattern: "^release-" + value: << pipeline.git.branch >> + - not: + matches: + pattern: "NOCIRCLECI" + value: << pipeline.trigger_parameters.github_app.commit_message >> jobs: - prepare_release: filters: diff --git a/releaser/releaser.go b/releaser/releaser.go index f2244842ad3..1cc8413e90f 100644 --- a/releaser/releaser.go +++ b/releaser/releaser.go @@ -101,7 +101,8 @@ func (r *ReleaseHandler) Run() error { return err } - if _, err := r.git("commit", "-a", "-m", fmt.Sprintf("%s Bump versions for release of %s\n\n[ci skip]", commitPrefix, newVersion)); err != nil { + // About NOCIRCLECI, see issue #12753. + if _, err := r.git("commit", "-a", "-m", fmt.Sprintf("%s Bump versions for release of %s\n\nNOCIRCLECI", commitPrefix, newVersion)); err != nil { return err }