Skip to content

Commit a3c7805

Browse files
authored
Merge pull request #9071 from g-gaston/release-notes-mutliple-areas-subs
🌱 Improve multiple areas PRs with user friendly subs
2 parents a847308 + 333b213 commit a3c7805

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

hack/tools/release/notes.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,10 @@ func getAreaLabel(merge string) (string, error) {
175175
var areaLabels []string
176176
for _, label := range pr.Labels {
177177
if area, ok := trimAreaLabel(label.Name); ok {
178+
if userFriendlyArea, ok := userFriendlyAreas[area]; ok {
179+
area = userFriendlyArea
180+
}
181+
178182
areaLabels = append(areaLabels, area)
179183
}
180184
}
@@ -183,13 +187,9 @@ func getAreaLabel(merge string) (string, error) {
183187
case 0:
184188
return missingAreaLabelPrefix, nil
185189
case 1:
186-
area := areaLabels[0]
187-
if userFriendlyArea, ok := userFriendlyAreas[area]; ok {
188-
area = userFriendlyArea
189-
}
190-
return area, nil
190+
return areaLabels[0], nil
191191
default:
192-
return multipleAreaLabelsPrefix + strings.Join(areaLabels, "|") + "]", nil
192+
return multipleAreaLabelsPrefix + strings.Join(areaLabels, "/") + "]", nil
193193
}
194194
}
195195

@@ -371,6 +371,7 @@ func run() int {
371371
str2 := strings.ToLower(mergeslice[j])
372372
return str1 < str2
373373
})
374+
374375
for _, merge := range mergeslice {
375376
fmt.Println(merge)
376377
}

0 commit comments

Comments
 (0)