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

Closes milestone on Github

Browse Source 
fixes #6
This commit is contained in:
Marcin Grzejszczak
2017-03-13 18:12:05 +01:00
parent d727a89d7a
commit 27f148ee43
13 changed files with 322 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/SpringReleaser.java
View File

@@ -61,7 +61,8 @@ public class SpringReleaser {
this.releaser.publishDocs(changedVersion);
}
if (!changedVersion.isSnapshot()) {
log.info("\n\n\n=== REVERTING CHANGES & BUMPING VERSION===\n\nPress ENTER to go back to snapshots and bump originalVersion by patch {}", MSG);
log.info("\n\n\n=== REVERTING CHANGES & BUMPING VERSION===\n\nPress ENTER to go "
+ "back to snapshots and bump originalVersion by patch {}", MSG);
boolean skipRevert = skipStep();
if (!skipRevert) {
this.releaser.rollbackReleaseVersion(project, originalVersion, changedVersion);
@@ -72,6 +73,13 @@ public class SpringReleaser {
if (!skipPush) {
this.releaser.pushCurrentBranch(project);
}
if (!changedVersion.isSnapshot()) {
log.info("\n\n\n=== CLOSING MILESTONE===\n\nPress ENTER to close the milestone at Github {}", MSG);
boolean skipMilestone = skipStep();
if (!skipMilestone) {
this.releaser.closeMilestone(changedVersion);
}
}
}
boolean skipStep() {

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

@@ -17,6 +17,7 @@ import org.springframework.cloud.release.internal.ReleaserProperties;
import org.springframework.cloud.release.internal.git.GitTestUtils;
import org.springframework.cloud.release.internal.git.ProjectGitUpdater;
import org.springframework.cloud.release.internal.pom.ProjectPomUpdater;
import org.springframework.cloud.release.internal.pom.ProjectVersion;
import org.springframework.cloud.release.internal.pom.TestPomReader;
import org.springframework.cloud.release.internal.pom.TestUtils;
import org.springframework.cloud.release.internal.project.ProjectBuilder;
@@ -33,6 +34,7 @@ public class AcceptanceTests {
TestPomReader testPomReader = new TestPomReader();
File springCloudConsulProject;
File temporaryFolder;
TestProjectGitUpdater gitUpdater;
@Before
public void setup() throws Exception {
@@ -61,6 +63,7 @@ public class AcceptanceTests {
commitIsPresent(iterator, "Update SNAPSHOT to 1.1.2.RELEASE");
pomVersionIsEqualTo(project, "1.2.1.BUILD-SNAPSHOT");
pomParentVersionIsEqualTo(project, "1.2.1.BUILD-SNAPSHOT");
then(this.gitUpdater.executed).isTrue();
}
private Iterable<RevCommit> listOfCommits(File project) throws GitAPIException {
@@ -106,7 +109,8 @@ public class AcceptanceTests {
ReleaserProperties properties = releaserProperties(projectFile);
ProjectPomUpdater pomUpdater = new ProjectPomUpdater(properties);
ProjectBuilder projectBuilder = new ProjectBuilder(properties, pomUpdater);
ProjectGitUpdater gitUpdater = new ProjectGitUpdater(properties);
TestProjectGitUpdater gitUpdater = new TestProjectGitUpdater(properties);
this.gitUpdater = gitUpdater;
return new SpringReleaser(new Releaser(pomUpdater, projectBuilder, gitUpdater), properties) {
@Override boolean skipStep() {
return false;
@@ -114,6 +118,21 @@ public class AcceptanceTests {
};
}
class TestProjectGitUpdater extends ProjectGitUpdater {
boolean executed = false;
public TestProjectGitUpdater(ReleaserProperties properties) {
super(properties);
}
@Override public void closeMilestone(ProjectVersion releaseVersion) {
then(releaseVersion.projectName).isEqualTo("spring-cloud-consul");
then(releaseVersion.version).isEqualTo("1.1.2.RELEASE");
this.executed = true;
}
}
private File tmpFile(String relativePath) {
return new File(this.temporaryFolder, relativePath);
}