aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <[email protected]>2024-08-18 19:12:03 +0200
committerBjørn Erik Pedersen <[email protected]>2024-08-18 19:12:03 +0200
commit46484bff84c82136740479e6420a7f88e2b20e94 (patch)
tree4cab6cbd38152e5b3e6078611d33a4d06b5f453d
parent0e5a26057c69078faa4a533b75761cda352a2a7e (diff)
downloadhugo-46484bff84c82136740479e6420a7f88e2b20e94.tar.gz
hugo-46484bff84c82136740479e6420a7f88e2b20e94.zip
Revert "releaser: Rework the run conditions"
This reverts commit 702b1e8b81c889f72207b5b8d0478c300c8ccf3e.
-rw-r--r--.circleci/config.yml9
-rw-r--r--releaser/releaser.go3
2 files changed, 1 insertions, 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
}