Skip to content

Commit

Permalink
releaser: Rework the run conditions
Browse files Browse the repository at this point in the history
Closes #12753
  • Loading branch information
bep committed Aug 18, 2024
1 parent c054cba commit 777534b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
13 changes: 10 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion releaser/releaser.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down

0 comments on commit 777534b

Please sign in to comment.