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

Bringing back Sagan

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-11-20 13:13:29 +01:00
parent 663ba13468
commit 7521f85236
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java
View File

@@ -156,10 +156,8 @@ public class Releaser {
public void updateSagan(File project, ProjectVersion releaseVersion) {
String currentBranch = this.projectGitHandler.currentBranch(project);
// TODO: restore sagan update
/*ProjectVersion originalVersion = new ProjectVersion(project);
ProjectVersion originalVersion = new ProjectVersion(project);
this.saganUpdater.updateSagan(currentBranch, originalVersion, releaseVersion);
log.info("\nSuccessfully updated Sagan for branch [{}]", currentBranch);*/
log.warn("\nSkipping Sagan update for branch [{}]", currentBranch);
log.info("\nSuccessfully updated Sagan for branch [{}]", currentBranch);
}
}

8
spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/AcceptanceTests.java
View File

@@ -98,8 +98,8 @@ public class AcceptanceTests {
.contains("Camden.SR5")
.contains("- Spring Cloud Config `1.2.2.RELEASE` ([issues](http://foo.bar.com/1.2.2.RELEASE))")
.contains("- Spring Cloud Aws `1.1.3.RELEASE` ([issues](http://foo.bar.com/1.1.3.RELEASE))");
/*TODO: restore BDDMockito.then(this.saganClient).should().updateRelease(BDDMockito.eq("spring-cloud-consul"),
BDDMockito.anyList());*/
BDDMockito.then(this.saganClient).should().updateRelease(BDDMockito.eq("spring-cloud-consul"),
BDDMockito.anyList());
}
@Test
@@ -137,8 +137,8 @@ public class AcceptanceTests {
.contains("Dalston.RC1")
.contains("- Spring Cloud Build `1.3.1.RELEASE` ([issues](http://foo.bar.com/1.3.1.RELEASE))")
.contains("- Spring Cloud Bus `1.3.0.M1` ([issues](http://foo.bar.com/1.3.0.M1))");
/*TODO: restore BDDMockito.then(this.saganClient).should().updateRelease(BDDMockito.eq("spring-cloud-consul"),
BDDMockito.anyList());*/
BDDMockito.then(this.saganClient).should().updateRelease(BDDMockito.eq("spring-cloud-consul"),
BDDMockito.anyList());
}
@Test