This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_10_0
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_10_0 by this push:
new 231ff189874 SOLR-17619 Do not attempt to extract Github Pull request
ID from branch name (#3809)
231ff189874 is described below
commit 231ff189874cac518db25bf82c91b30dd91c438b
Author: Jan Høydahl <[email protected]>
AuthorDate: Tue Oct 28 10:01:48 2025 +0100
SOLR-17619 Do not attempt to extract Github Pull request ID from branch
name (#3809)
(cherry picked from commit 65b0f7b57c92fcce7411cb656ca1cc03338746d5)
---
gradle/changelog.gradle | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/gradle/changelog.gradle b/gradle/changelog.gradle
index cd54cce9ad7..6c5ea72e7bb 100644
--- a/gradle/changelog.gradle
+++ b/gradle/changelog.gradle
@@ -32,14 +32,11 @@ task writeChangelog {
def asfId = providers.gradleProperty("user.asfid").getOrElse(null)
def asfIdUrl = asfId ? "\n url:
https://home.apache.org/phonebook.html?uid=${asfId}"; : ""
def gitBranch = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim()
- def jiraMatcher = gitBranch =~ /SOLR-\d+/
+ def jiraMatcher = gitBranch.toUpperCase() =~ /SOLR-\d\d\d+/
def jiraRef = jiraMatcher ? jiraMatcher[0] : "SOLR-XXXX"
def jiraUrl = "https://issues.apache.org/jira/browse/${jiraRef}";
def jiraLinks = jiraMatcher ? "links:\n - name: ${jiraRef}\n url:
${jiraUrl}" : ""
- def githubMatcher = gitBranch =~ /(PR|GH|GITHUB|#)?(\d+)/
- def githubRef = githubMatcher ? githubMatcher.group(2) : ""
- def githubLink = githubMatcher ? "issues:\n - ${githubRef}" : ""
- def branchWithoutJira = gitBranch.replaceFirst(/(SOLR|LUCENE|INFRA)-\d+-/,
"").replaceFirst(/(PR|GH|GITHUB|#)?(\d+)/, "").replace("-", " ").capitalize()
+ def branchWithoutJira = gitBranch.replaceFirst(/(?i)SOLR-\d\d\d+-/,
"").replace("-", " ").capitalize()
def fileName = "changelog/unreleased/${gitBranch}.yml"
def file = new File(fileName)
file.parentFile.mkdirs()
@@ -49,7 +46,6 @@ type: other # added, changed, fixed, deprecated, removed,
dependency_update, sec
authors:
- name: ${configuredName}${nick}${asfIdUrl}
${jiraLinks}
-${githubLink}
"""
println "Generated file: ${fileName} -- open it"
