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

Added skip project names feature; fixes gh-87

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-06-25 10:39:54 +02:00
parent 9578294fbd
commit 2a4cf036c6
5 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,9 +62,8 @@ public class SpringReleaser {
if (options.metaRelease) {
log.info("Meta Release picked. Will iterate over all projects and perform release of each one");
this.properties.getGit().setFetchVersionsFromGit(false);
metaReleaseProjects(options).forEach(project -> {
processProjectForMetaRelease(options, project);
});
metaReleaseProjects(options)
.forEach(project -> processProjectForMetaRelease(options, project));
} else {
log.info("Single project release picked. Will release only the current project");
File projectFolder = projectFolder();
@@ -115,19 +114,23 @@ public class SpringReleaser {
private List<String> metaReleaseProjects(Options options) {
List<String> projects = new ArrayList<>(this.properties.getFixedVersions().keySet());
log.info("List of projects that should not be cloned {}", this.properties.getMetaRelease().getProjectsToSkip());
List<String> filteredProjects = projects.stream()
.filter(project -> !this.properties.getMetaRelease().getProjectsToSkip().contains(project))
.collect(Collectors.toList());
if (StringUtils.hasText(options.startFrom)) {
int projectIndex = projects.indexOf(options.startFrom);
int projectIndex = filteredProjects.indexOf(options.startFrom);
if (projectIndex < 0) throw new IllegalStateException("Project [" + options.startFrom + "] not found");
projects = projects.subList(projectIndex, projects.size());
filteredProjects = filteredProjects.subList(projectIndex, projects.size());
options.startFrom = "";
} else if (!options.taskNames.isEmpty()) {
projects = projects.stream()
filteredProjects = filteredProjects.stream()
.filter(project -> options.taskNames.contains(project))
.collect(Collectors.toList());
options.taskNames = new ArrayList<>();
}
log.info("\n\n\nFor meta-release, will release the projects {}\n\n\n", projects);
return projects;
log.info("\n\n\nFor meta-release, will release the projects {}\n\n\n", filteredProjects);
return filteredProjects;
}
private File projectFolder() {

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

@@ -203,6 +203,22 @@ public class AcceptanceTests {
.updateDocsRepo(BDDMockito.any(ProjectVersion.class), BDDMockito.anyString());
}
@Test
public void should_not_clone_any_projects_when_they_are_on_list_of_projects_to_skip() throws Exception {
Map<String, String> versions = new HashMap<>();
versions.put("spring-cloud-release", "Camden.BUILD-SNAPSHOT");
versions.put("spring-cloud-consul", "1.1.2.BUILD-SNAPSHOT");
SpringReleaser releaser = metaReleaser(versions);
this.releaserProperties.getMetaRelease().getProjectsToSkip().add("spring-cloud-release");
this.releaserProperties.getMetaRelease().getProjectsToSkip().add("spring-cloud-consul");
File temporaryDestination = tmp.newFolder();
this.releaserProperties.getGit().setCloneDestinationDir(temporaryDestination.getAbsolutePath());
releaser.release(new OptionsBuilder().metaRelease(true).options());
then(temporaryDestination.list()).isEmpty();
}
@Test
public void should_perform_a_meta_release_of_consul_only_when_run_from_got_passed() throws Exception {
// simulates an org