From 46484bff84c82136740479e6420a7f88e2b20e94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Sun, 18 Aug 2024 19:12:03 +0200
Subject: [PATCH] Revert "releaser: Rework the run conditions"

This reverts commit 702b1e8b81c889f72207b5b8d0478c300c8ccf3e.
---
 .circleci/config.yml | 9 ---------
 releaser/releaser.go | 3 +--
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3093b28d4..0ff955936 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -96,15 +96,6 @@ 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 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
 		}