mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-20 21:31:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

releaser: Replace the magic version handling

Browse Source 
Take the new version as a string value.
This commit is contained in:
Bjørn Erik Pedersen
2017-07-05 10:23:07 +02:00
parent e7a54e7afc
commit 5f831a6223
5 changed files with 69 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
releaser/releaser.go
View File

@@ -31,7 +31,7 @@ import (
const commitPrefix = "releaser:"
type ReleaseHandler struct {
patch int
cliVersion string
// If set, we do the releases in 3 steps:
// 1: Create and write a draft release notes
@@ -62,24 +62,16 @@ func (r ReleaseHandler) shouldPrepareVersions() bool {
return r.step < 1 || r.step == 2
}
func (r ReleaseHandler) calculateVersions(current helpers.HugoVersion) (helpers.HugoVersion, helpers.HugoVersion) {
var (
newVersion = current
finalVersion = current
)
func (r ReleaseHandler) calculateVersions() (helpers.HugoVersion, helpers.HugoVersion) {
newVersion := helpers.MustParseHugoVersion(r.cliVersion)
finalVersion := newVersion
finalVersion.PatchLevel = 0
newVersion.Suffix = ""
if r.shouldContinue() {
// The version in the current code base is in the state we want for
// the release.
if r.patch == 0 {
finalVersion = newVersion.Next()
}
} else if r.patch > 0 {
newVersion = helpers.CurrentHugoVersion.NextPatchLevel(r.patch)
} else {
finalVersion = newVersion.Next()
if newVersion.PatchLevel == 0 {
finalVersion = finalVersion.Next()
}
finalVersion.Suffix = "-DEV"
@@ -87,8 +79,8 @@ func (r ReleaseHandler) calculateVersions(current helpers.HugoVersion) (helpers.
return newVersion, finalVersion
}
func New(patch, step int, skipPublish, try bool) *ReleaseHandler {
rh := &ReleaseHandler{patch: patch, step: step, skipPublish: skipPublish, try: try}
func New(version string, step int, skipPublish, try bool) *ReleaseHandler {
rh := &ReleaseHandler{cliVersion: version, step: step, skipPublish: skipPublish, try: try}
if try {
rh.git = func(args ...string) (string, error) {
@@ -107,7 +99,7 @@ func (r *ReleaseHandler) Run() error {
return errors.New("GITHUB_TOKEN not set, create one here with the repo scope selected: https://github.com/settings/tokens/new")
}
newVersion, finalVersion := r.calculateVersions(helpers.CurrentHugoVersion)
newVersion, finalVersion := r.calculateVersions()
version := newVersion.String()
tag := "v" + version