Merge branch 'feat/author-names' into feat/issue-prs

Signed-off-by: Keith Zantow <[email protected]>
anchore · Jan 24, 2023 · 9f60cc9 · 9f60cc9
2 parents fe7f74c + 2a61d36
commit 9f60cc9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/chronicle/release/releasers/github/summarizer.go b/chronicle/release/releasers/github/summarizer.go
@@ -315,7 +315,7 @@ func createChangesFromIssues(config Config, allMergedPRs []ghPullRequest, issues
 							URL:  pr.URL,
 						})
 					}
-					if config.IncludeIssuePRAuthors {
+					if config.IncludeIssuePRAuthors && pr.Author != "" {
 						references = append(references, change.Reference{
 							Text: pr.Author,
 							URL:  fmt.Sprintf("https://%s/%s", config.Host, pr.Author),

diff --git a/internal/config/github.go b/internal/config/github.go
@@ -14,8 +14,8 @@ type githubSummarizer struct {
 	ExcludeLabels          []string       `yaml:"exclude-labels" json:"exclude-labels" mapstructure:"exclude-labels"`
 	IncludeIssuePRAuthors  bool           `yaml:"include-issue-pr-authors" json:"include-issue-pr-authors" mapstructure:"include-issue-pr-authors"`
 	IncludeIssuePRs        bool           `yaml:"include-issue-prs" json:"include-issue-prs" mapstructure:"include-issue-prs"`
-	IncludeIssues          bool           `yaml:"include-issues" json:"include-issues" mapstructure:"include-issues"`
 	IncludePRs             bool           `yaml:"include-prs" json:"include-prs" mapstructure:"include-prs"`
+	IncludeIssues          bool           `yaml:"include-issues" json:"include-issues" mapstructure:"include-issues"`
 	IssuesRequireLinkedPR  bool           `yaml:"issues-require-linked-prs" json:"issues-require-linked-prs" mapstructure:"issues-require-linked-prs"`
 	ConsiderPRMergeCommits bool           `yaml:"consider-pr-merge-commits" json:"consider-pr-merge-commits" mapstructure:"consider-pr-merge-commits"`
 	Changes                []githubChange `yaml:"changes" json:"changes" mapstructure:"changes"`
@@ -55,12 +55,12 @@ func (cfg githubSummarizer) ToGithubConfig() (github.Config, error) {
 
 func (cfg githubSummarizer) loadDefaultValues(v *viper.Viper) {
 	v.SetDefault("github.host", "github.com")
+	v.SetDefault("github.issues-require-linked-prs", false)
 	v.SetDefault("github.consider-pr-merge-commits", true)
+	v.SetDefault("github.include-prs", true)
 	v.SetDefault("github.include-issue-pr-authors", true)
 	v.SetDefault("github.include-issue-prs", true)
 	v.SetDefault("github.include-issues", true)
-	v.SetDefault("github.include-prs", true)
-	v.SetDefault("github.issues-require-linked-prs", false)
 	v.SetDefault("github.exclude-labels", []string{"duplicate", "question", "invalid", "wontfix", "wont-fix", "release-ignore", "changelog-ignore", "ignore"})
 	v.SetDefault("github.changes", []githubChange{
 		{