Revert "releaser: Rework the run conditions"

This reverts commit 777534b2a46127ad0392562b4de56ba3ff70a810.

Circle ci throws validation errors:

```
Config does not conform to schema: {:workflows {:release {:jobs [{:prepare_release (not (map? nil)), :when {:and disallowed-key}} nil nil nil]}}}
```

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 52ce01f6ab842ef027f7646879dd76e0140682be..0ff9559365e44e8c2f76e103db866f588b147320 100644 (file)
--- 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 1cc8413e90f577bdef9fbc58a1b97ef8572ebcc8..f2244842ad35643c1468b87e96c68a3d0e34cee2 100644 (file)
--- 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
                }