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

Resolves branches for new calver

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-05-21 12:20:53 +02:00
parent 66e4188a93
commit 0e3a95f9aa
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
releaser-core/src/main/java/releaser/internal/git/ProjectGitHandler.java
View File

@@ -279,22 +279,25 @@ public class ProjectGitHandler implements Closeable {
}
// let's go with convention... If fixed version contains e.g.
// 2.3.4.RELEASE of Sleuth, we will first check if `2.0.x` branch
// 2.3.4.RELEASE of Sleuth, we will first check if `2.3.x` branch
// exists. If not, then we will assume that `master` contains it
private String branchFromVersion(String version) {
String branchFromVersion(String version) {
// 2.3.4.RELEASE -> 2.3.4
// 2.3.4-RELEASE -> 2.3.4
// Camden.RELEASE -> Camden
// Camden-SR -> Camden
// 2020.0.0-M1 -> 2020.0.x
int indexOfDot = version.lastIndexOf(".");
int indexOfDash = version.indexOf("-");
int indexToPick = indexOfDot > 0 ? indexOfDot : indexOfDash;
String versionTillPatch = version.substring(0, indexToPick);
// 2.3.4 -> [2,3,4]
// Camden -> [Camden]
// 2020.0.0-M1 -> [2020, 0]
String[] splitVersion = versionTillPatch.split("\\.");
if (splitVersion.length == 3) {
if (splitVersion.length > 1) {
// [2,3,4] -> 2.3.x
// [2020, 0] -> 2020.0.x
return splitVersion[0] + "." + splitVersion[1] + ".x";
}
else if (splitVersion.length == 1) {

7
releaser-core/src/test/java/releaser/internal/git/ProjectGitHandlerTests.java
View File

@@ -119,6 +119,13 @@ public class ProjectGitHandlerTests {
then(this.gitRepo).should().pushCurrentBranch();
}
@Test
public void should_retrieve_version_from_branch_for_calver() {
String branch = this.updater.branchFromVersion("2020.0.0-M1");
BDDAssertions.then(branch).isEqualTo("2020.0.x");
}
@Test
public void should_throw_exception_when_no_fixed_version_passed_for_the_project() {
BDDAssertions