SOLR-17619: writeChangelog: trim leading path from branch #3818
+5
−5
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The branch might look like `aaa/bbb/SOLR-XXXX-blah` -- the leading path portions interfere with creating THE yaml change file. I ended up adding a `.replaceAll(".*/", "")` to the branch
dsmiley
commented
Oct 28, 2025
| def gitBranch = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim() | ||
| def jiraMatcher = gitBranch.toUpperCase() =~ /SOLR-\d\d\d+/ | ||
| def jiraRef = jiraMatcher ? jiraMatcher[0] : "SOLR-XXXX" | ||
| def gitBranch = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim().replaceFirst(/^.*\//, "") |
There was a problem hiding this comment.
this specific line is the substance. I also tweaked some other things...
Comment on lines
+35
to
+36
| def jiraMatcher = gitBranch =~ /(?i)SOLR-\d\d\d+/ | ||
| def jiraRef = jiraMatcher ? jiraMatcher[0].toUpperCase() : "SOLR-XXXX" |
There was a problem hiding this comment.
Use the same regexp as further below; case insensitive match. then normalize what we find to uppercase
janhoy
added a commit
to janhoy/solr
that referenced
this pull request
Oct 30, 2025
|
Incorporated into #3820 |
janhoy
added a commit
that referenced
this pull request
Oct 30, 2025
* SOLR-17619 Cleanup after logchange cutover * Exclude generated archive.md files from license checks * Fix generate-filename * Incorporate David's suggestion. * Fixes precommit Fixes #3818
janhoy
added a commit
that referenced
this pull request
Oct 30, 2025
* SOLR-17619 Cleanup after logchange cutover * Exclude generated archive.md files from license checks * Fix generate-filename * Incorporate David's suggestion. * Fixes precommit Fixes #3818 (cherry picked from commit fb74fa8)
janhoy
added a commit
that referenced
this pull request
Oct 30, 2025
* SOLR-17619 Cleanup after logchange cutover * Exclude generated archive.md files from license checks * Fix generate-filename * Incorporate David's suggestion. * Fixes precommit Fixes #3818 (cherry picked from commit fb74fa8)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The branch might look like
aaa/bbb/SOLR-XXXX-blah-- the leading path portions interfere with creating the yaml change file. I ended up adding a.replaceAll(".*/", "")to the branch