florian
/
gitea-release-drafter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix/1/stop-duplicate-prs-in-release-draft #2

Merged
florian merged 4 commits from fix/1/stop-duplicate-prs-in-release-draft into main 2024-01-15 10:34:07 +01:00
Conversation 0 Commits 4 Files Changed 2 +22 -13
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 85024c71c2 - Show all commits

2
src/action.go
View File

@ -39,7 +39,7 @@ func updateOrCreateDraftRelease(a *Action, cfg *config.RepoConfig) (*gitea.Relea
return nil, err return nil, err
} }
changelog, err := GenerateChangelog(a.client, a.config.RepoOwner, a.config.RepoName, last) changelog, err := GenerateChangelog(a.client, a.config.RepoOwner, a.config.RepoName, last, cfg.Categories)
if err != nil { if err != nil {
return nil, err return nil, err
} }

33
src/changelog.go
View File

@ -2,14 +2,23 @@ package src
import ( import (
"code.gitea.io/sdk/gitea" "code.gitea.io/sdk/gitea"
"git.beisel.it/florian/gitea-release-drafter/src/config"
"github.com/sethvargo/go-githubactions" "github.com/sethvargo/go-githubactions"
) )
type Changelog map[string][]*gitea.PullRequest type Changelog map[string][]*gitea.PullRequest
// GenerateChangelog fetches all the pull requests merged into the default branch since the last release and groups them by label. note that duplicates might occur if a pull request has multiple labels. // GenerateChangelog fetches all the pull requests merged into the default branch since the last release and groups them by label.
func GenerateChangelog(c *gitea.Client, owner string, repo string, lastRelease *gitea.Release) (*Changelog, error) { func GenerateChangelog(c *gitea.Client, owner string, repo string, lastRelease *gitea.Release, categories []config.Category) (*Changelog, error) {
changelogByLabels := make(Changelog) changelogByLabels := make(Changelog)
validLabels := make(map[string]string)
// Construct a set of valid labels from the categories
for _, category := range categories {
for _, label := range category.Labels {
validLabels[label] = category.Title
}
}
// FIXME: use pagination // FIXME: use pagination
prs, _, err := c.ListRepoPullRequests(owner, repo, gitea.ListPullRequestsOptions{ prs, _, err := c.ListRepoPullRequests(owner, repo, gitea.ListPullRequestsOptions{
@ -20,21 +29,21 @@ func GenerateChangelog(c *gitea.Client, owner string, repo string, lastRelease *
} }
for _, pr := range prs { for _, pr := range prs {
// only consider merged pull requests. note that we can't filter by that in the API
if pr.HasMerged { if pr.HasMerged {
// if there was a release, only take into account pull requests that have been merged after that if lastRelease == nil || (lastRelease != nil && pr.Merged.After(lastRelease.CreatedAt)) {
if lastRelease == nil || lastRelease != nil && pr.Merged.After(lastRelease.CreatedAt) { addedToChangelog := false
for _, l := range pr.Labels { for _, prLabel := range pr.Labels {
_, ok := changelogByLabels[l.Name] categoryTitle, ok := validLabels[prLabel.Name]
if ok { if ok {
changelogByLabels[l.Name] = append(changelogByLabels[l.Name], pr) changelogByLabels[categoryTitle] = append(changelogByLabels[categoryTitle], pr)
} else { addedToChangelog = true
changelogByLabels[l.Name] = []*gitea.PullRequest{pr} break
} }
} }
if len(pr.Labels) == 0 { if !addedToChangelog && len(pr.Labels) > 0 {
githubactions.Warningf("PR #%d has labels but none match configured categories", pr.ID)
} else if len(pr.Labels) == 0 {
githubactions.Warningf("PR #%d doesn't have any labels", pr.ID) githubactions.Warningf("PR #%d doesn't have any labels", pr.ID)
} }
} }