diff options
Diffstat (limited to 'generator')
| -rw-r--r-- | generator/annual-report/sig_report.tmpl | 4 | ||||
| -rw-r--r-- | generator/app.go | 25 |
2 files changed, 23 insertions, 6 deletions
diff --git a/generator/annual-report/sig_report.tmpl b/generator/annual-report/sig_report.tmpl index 2b9206e9..830c119e 100644 --- a/generator/annual-report/sig_report.tmpl +++ b/generator/annual-report/sig_report.tmpl @@ -16,9 +16,9 @@ {{$releases := getReleases}} {{$owingsig := .Dir}} -3. KEP work in {{lastYear}} (v{{$releases.Latest}}, v{{$releases.LatestMinusOne}}, v{{$releases.LatestMinusTwo}}): +3. KEP work in {{lastYear}} ({{$releases.LatestMinusTwo}}, {{$releases.LatestMinusOne}}, {{$releases.Latest}}): {{- range $stage, $keps := filterKEPs $owingsig $releases}} - {{ $stage }}: + - {{ $stage }}: {{- range $keps}} - [{{.Number}} - {{.Title}}](https://github.com/kubernetes/enhancements/tree/master/keps/{{.OwningSIG}}/{{.Name}}) - {{.LatestMilestone -}} {{ end}} diff --git a/generator/app.go b/generator/app.go index 09986697..0e5d5fd0 100644 --- a/generator/app.go +++ b/generator/app.go @@ -43,6 +43,8 @@ import ( "github.com/go-git/go-git/v5/storage/memory" yaml "gopkg.in/yaml.v3" + + "golang.org/x/mod/semver" ) const ( @@ -104,9 +106,24 @@ func getLastThreeK8sReleases() (Releases, error) { return Releases{}, err } var result Releases - result.Latest = strings.Split(strings.TrimPrefix(*releases[0].TagName, "v"), ".")[0] + "." + strings.Split(strings.TrimPrefix(*releases[0].TagName, "v"), ".")[1] - result.LatestMinusOne = strings.Split(strings.TrimPrefix(*releases[1].TagName, "v"), ".")[0] + "." + strings.Split(strings.TrimPrefix(*releases[1].TagName, "v"), ".")[1] - result.LatestMinusTwo = strings.Split(strings.TrimPrefix(*releases[2].TagName, "v"), ".")[0] + "." + strings.Split(strings.TrimPrefix(*releases[2].TagName, "v"), ".")[1] + for _, release := range releases { + if release.GetPrerelease() || release.GetDraft() { + continue + } + if result.Latest == "" { + result.Latest = semver.MajorMinor(release.GetTagName()) + continue + } + if result.LatestMinusOne == "" { + result.LatestMinusOne = semver.MajorMinor(release.GetTagName()) + continue + } + if result.LatestMinusTwo == "" { + result.LatestMinusTwo = semver.MajorMinor(release.GetTagName()) + break + } + } + return result, nil } @@ -756,7 +773,7 @@ func createAnnualReport(groups []Group, prefix string) error { outputPath := filepath.Join(outputDir, fmt.Sprintf("annual-report-%s.md", lastYear())) templatePath := filepath.Join(baseGeneratorDir, templateDir, templateFile) - if err := writeTemplate(templatePath, outputPath, "markdown", group); err != nil { + if err := writeTemplate(templatePath, outputPath, "", group); err != nil { return err } } |