Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions launch/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ task buildChangelog {
"milestone" : "${openHABMilestone}",
"repos" : [
[
"name" : "openhab-core"
"name" : "openhab-core",
"name" : "openhab-distro"
]
]
],[
Expand Down Expand Up @@ -119,7 +120,7 @@ task buildChangelog {
def pageString = ""

while (searchesLeft > 0) {
curlURL = "https://api.github.com/search/issues?q=repo:${orgName}/${repoName}%20is:pr${mergedString}${labelString}&per_page=100${pageString}"
curlURL = "https://api.github.com/search/issues?q=repo:${orgName}/${repoName}%20is:pr${mergedString}${milestoneString}${labelString}&per_page=100${pageString}"
print "Parsing: ${orgName}/${repoName} (Milestone ${milestone}, Page ${pageNumber}"

// Perform HTTP request using native Groovy/Java (no external exec)
Expand Down Expand Up @@ -245,7 +246,15 @@ task buildChangelog {
}
}

outputText = outputText + "\nThis patch release contains the following bug fixes:\n"
// Choose output text based on whether this is a milestone or patch release
if (isMilestoneRelease) {
// Extract the major.minor version (a.b) from milestone version (a.b.c.Mx)
def baseVersion = openHABVersion.replaceAll(/\.M\d+$/, '') // Remove .Mx suffix
def majorMinorVersion = baseVersion.replaceAll(/\.\d+$/, '') // Remove patch version to get major.minor
outputText = outputText + "\nThis is a monthly milestone build for the upcoming openHAB ${majorMinorVersion} release, which brings many fixes and improvements.\n"
} else {
outputText = outputText + "\nThis patch release contains the following bug fixes:\n"
}

["Core", "Add-ons", "UIs"].each {categoryName ->

Expand Down