diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2017-07-06 02:32:55 +0300 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2017-07-06 02:32:55 +0300 |
| commit | 477684022f6816e6d2a0358caa6432c4d6f65da5 (patch) | |
| tree | 5a35c32cc600d10904fd529630bf045093fbff50 /releaser | |
| parent | 70d8ddcb60b9102d57bcc6764ffb28bc4fa34f6d (diff) | |
releaser: Adjustments
Diffstat (limited to 'releaser')
| -rw-r--r-- | releaser/git.go | 5 | ||||
| -rw-r--r-- | releaser/releasenotes_writer.go | 5 | ||||
| -rw-r--r-- | releaser/releaser.go | 3 |
3 files changed, 3 insertions, 10 deletions
diff --git a/releaser/git.go b/releaser/git.go index 5cfce5464..2d49d2102 100644 --- a/releaser/git.go +++ b/releaser/git.go @@ -29,7 +29,6 @@ const ( templateChanges = "templateChanges" coreChanges = "coreChanges" outChanges = "outChanges" - docsChanges = "docsChanges" otherChanges = "otherChanges" ) @@ -91,8 +90,6 @@ func gitInfosToChangeLog(infos gitInfos) *changeLog { category = notesChanges } else if regexp.MustCompile("(?i)tpl|tplimpl:|layout").MatchString(los) { category = templateChanges - } else if regexp.MustCompile("(?i)docs?:|documentation:").MatchString(los) { - category = docsChanges } else if regexp.MustCompile("(?i)hugolib:").MatchString(los) { category = coreChanges } else if regexp.MustCompile("(?i)out(put)?:|media:|Output|Media").MatchString(los) { @@ -247,7 +244,7 @@ func getGitInfosBefore(ref, tag string, remote bool) (gitInfos, error) { } // Ignore autogenerated commits etc. in change log. This is a regexp. -const ignoredCommits = "releaser?:|snapcraft:" +const ignoredCommits = "releaser?:|snapcraft:|Merge commit|Squashed|Revert" func gitLogBefore(ref, tag string) (string, error) { var prevTag string diff --git a/releaser/releasenotes_writer.go b/releaser/releasenotes_writer.go index ced9254af..84c8450e6 100644 --- a/releaser/releasenotes_writer.go +++ b/releaser/releasenotes_writer.go @@ -75,7 +75,6 @@ Hugo now has: {{ $tmplChanges := index . "templateChanges" -}} {{- $outChanges := index . "outChanges" -}} {{- $coreChanges := index . "coreChanges" -}} -{{- $docsChanges := index . "docsChanges" -}} {{- $otherChanges := index . "otherChanges" -}} {{- with $tmplChanges -}} ### Templates @@ -89,10 +88,6 @@ Hugo now has: ### Core {{ template "change-section" . }} {{- end -}} -{{- with $docsChanges -}} -### Docs -{{ template "change-section" . }} -{{- end -}} {{- with $otherChanges -}} ### Other {{ template "change-section" . }} diff --git a/releaser/releaser.go b/releaser/releaser.go index aeca47df2..ff44bd25c 100644 --- a/releaser/releaser.go +++ b/releaser/releaser.go @@ -24,6 +24,7 @@ import ( "os/exec" "path/filepath" "regexp" + "strings" "github.com/gohugoio/hugo/helpers" ) @@ -84,7 +85,7 @@ func New(version string, step int, skipPublish, try bool) *ReleaseHandler { if try { rh.git = func(args ...string) (string, error) { - fmt.Println("git", args) + fmt.Println("git", strings.Join(args, " ")) return "", nil } } else { |