SpringCloud/spring-cloud-release-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the gh issue titles

Browse Source
This commit is contained in:
Marcin Grzejszczak
2019-08-19 14:13:18 +02:00
parent ae9f0a7266
commit d863dfc904
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GithubIssues.java
View File

@@ -42,7 +42,7 @@ class GithubIssues {
private static final Logger log = LoggerFactory.getLogger(GithubIssues.class);
private static final String GITHUB_ISSUE_TITLE = "Spring Cloud Release took place";
private static final String GITHUB_ISSUE_TITLE = "release of the [%s] release train took place";
private final Github github;
@@ -99,8 +99,9 @@ class GithubIssues {
private void fileAGithubIssue(String user, String repo, Projects projects,
String releaseVersion) {
Repo ghRepo = this.github.repos().get(new Coordinates.Simple(user, repo));
String issueTitle = StringUtils.capitalize(releaseVersion) + " "
+ GITHUB_ISSUE_TITLE;
String issueTitle = "[" + StringUtils.capitalize(releaseVersion) + "] "
+ String.format(GITHUB_ISSUE_TITLE,
this.properties.getMetaRelease().getReleaseTrainProjectName());
// check if the issue is not already there
boolean issueAlreadyFiled = issueAlreadyFiled(ghRepo, issueTitle);
if (issueAlreadyFiled) {
@@ -128,9 +129,10 @@ class GithubIssues {
}
private String issueText(Projects projects) {
StringBuilder builder = new StringBuilder().append("Spring Cloud [")
.append(parsedVersion()).append("] Released with the following projects:")
.append("\n\n");
StringBuilder builder = new StringBuilder().append("Release train [")
.append(this.properties.getMetaRelease().getReleaseTrainProjectName())
.append("] in version [").append(parsedVersion())
.append("] released with the following projects:").append("\n\n");
projects.forEach(project -> builder.append(project.projectName).append(" : ")
.append("`").append(project.version).append("`").append("\n"));
return builder.toString();

14
spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/git/GithubIssuesTests.java
View File

@@ -114,9 +114,10 @@ public class GithubIssuesTests {
.issues().get(1);
then(issue.exists()).isTrue();
Issue.Smart smartIssue = new Issue.Smart(issue);
then(smartIssue.title())
.isEqualTo("Edgware.RELEASE Spring Cloud Release took place");
then(smartIssue.body()).contains("Spring Cloud [Edgware.RELEASE]")
then(smartIssue.title()).isEqualTo(
"[Edgware.RELEASE] release of the [spring-cloud-release] release train took place");
then(smartIssue.body()).contains(
"Release train [spring-cloud-release] in version [Edgware.RELEASE] released with the following projects")
.contains("foo : `1.0.0.RELEASE`").contains("bar : `2.0.0.RELEASE`")
.contains("baz : `3.0.0.RELEASE`");
}
@@ -182,9 +183,10 @@ public class GithubIssuesTests {
.get(1);
then(issue.exists()).isTrue();
Issue.Smart smartIssue = new Issue.Smart(issue);
then(smartIssue.title())
.isEqualTo("Edgware.RELEASE Spring Cloud Release took place");
then(smartIssue.body()).contains("Spring Cloud [Edgware.RELEASE]")
then(smartIssue.title()).isEqualTo(
"[Edgware.RELEASE] release of the [spring-cloud-release] release train took place");
then(smartIssue.body()).contains(
"Release train [spring-cloud-release] in version [Edgware.RELEASE] released with the following projects")
.contains("foo : `1.0.0.RELEASE`").contains("bar : `2.0.0.RELEASE`")
.contains("baz : `3.0.0.RELEASE`");
}