From ebd636e4d5f475d4b5d9047580e61ff7c2bf2fb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Sat, 20 May 2017 11:11:23 +0300 Subject: [PATCH] releaser: Delay the version bumping So we can do the release notes in its own branch if needed. --- releaser/releaser.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/releaser/releaser.go b/releaser/releaser.go index e7e7f479f..088b52ec1 100644 --- a/releaser/releaser.go +++ b/releaser/releaser.go @@ -119,14 +119,6 @@ func (r *ReleaseHandler) Run() error { } if r.shouldPrepare() { - if err := bumpVersions(newVersion); err != nil { - return err - } - - if _, err := git("commit", "-a", "-m", fmt.Sprintf("%s Bump versions for release of %s\n\n[ci skip]", commitPrefix, newVersion)); err != nil { - return err - } - releaseNotesFile, err := writeReleaseNotesToDocsTemp(version, gitCommits) if err != nil { return err @@ -145,6 +137,14 @@ func (r *ReleaseHandler) Run() error { return nil } + if err := bumpVersions(newVersion); err != nil { + return err + } + + if _, err := git("commit", "-a", "-m", fmt.Sprintf("%s Bump versions for release of %s\n\n[ci skip]", commitPrefix, newVersion)); err != nil { + return err + } + releaseNotesFile := getRelaseNotesDocsTempFilename(version) // Write the release notes to the docs site as well.