aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <[email protected]>2024-08-18 11:47:51 +0200
committerBjørn Erik Pedersen <[email protected]>2024-08-18 11:47:51 +0200
commit777534b2a46127ad0392562b4de56ba3ff70a810 (patch)
tree8c4a42506cdc4c25a23f42691e3dc7d5e8add93d
parentc054cba0423fa7e677506fcec67d702486dec01e (diff)
downloadhugo-777534b2a46127ad0392562b4de56ba3ff70a810.tar.gz
hugo-777534b2a46127ad0392562b4de56ba3ff70a810.zip
releaser: Rework the run conditionsfixskip12753
Closes #12753
-rw-r--r--.circleci/config.yml13
-rw-r--r--releaser/releaser.go3
2 files changed, 12 insertions, 4 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0ff955936..52ce01f6a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -98,9 +98,16 @@ workflows:
release:
jobs:
- prepare_release:
- filters:
- branches:
- only: /release-.*/
+ when:
+ and:
+ - matches:
+ pattern: "^release-"
+ value: << pipeline.git.branch >>
+ - not:
+ - matches:
+ pattern: "NOCIRCLECI"
+ value: << pipeline.trigger_parameters.github_app.commit_message >>
+
- build_container1:
requires:
- prepare_release
diff --git a/releaser/releaser.go b/releaser/releaser.go
index f2244842a..1cc8413e9 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
}