releaser: Rework the run conditions

Now after actually reading the CircleCI docs...

Closes #12753

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