diff options
| -rw-r--r-- | .circleci/config.yml | 13 | ||||
| -rw-r--r-- | releaser/releaser.go | 3 |
2 files changed, 4 insertions, 12 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 52ce01f6a..0ff955936 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -98,16 +98,9 @@ workflows: release: jobs: - prepare_release: - when: - and: - - matches: - pattern: "^release-" - value: << pipeline.git.branch >> - - not: - - matches: - pattern: "NOCIRCLECI" - value: << pipeline.trigger_parameters.github_app.commit_message >> - + filters: + branches: + only: /release-.*/ - build_container1: requires: - prepare_release diff --git a/releaser/releaser.go b/releaser/releaser.go index 1cc8413e9..f2244842a 100644 --- a/releaser/releaser.go +++ b/releaser/releaser.go @@ -101,8 +101,7 @@ func (r *ReleaseHandler) Run() error { return err } - // 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 { + if _, err := r.git("commit", "-a", "-m", fmt.Sprintf("%s Bump versions for release of %s\n\n[ci skip]", commitPrefix, newVersion)); err != nil { return err } |