Spring/spring-data-dev-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#9 Added command to leniently remove local tags for a release train.

Browse Source
This commit is contained in:
Oliver Gierke
2016-02-12 15:25:08 +01:00
parent 861b8e4e9d
commit 121cd8fe80
2 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
release-tools/src/main/java/org/springframework/data/release/git/GitCommands.java
View File

@@ -99,4 +99,9 @@ public class GitCommands implements CommandMarker {
git.push(iteration); git.push(iteration);
} }
} }
@CliCommand("git remove tags")
public void removeTags(@CliOption(key = "", mandatory = true) TrainIteration iteration) {
git.removeTags(iteration);
}
} }

36
release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java
View File

@@ -144,12 +144,8 @@ public class GitOperations {
Project project = module.getProject(); Project project = module.getProject();
ArtifactVersion artifactVersion = ArtifactVersion.of(module); ArtifactVersion artifactVersion = ArtifactVersion.of(module);
Tag tag = findTagFor(project, artifactVersion); Tag tag = findTagFor(project, artifactVersion).orElseThrow(() -> new IllegalStateException(
String.format("No tag found for version %s of project %s, aborting.", artifactVersion, project)));
if (tag == null) {
throw new IllegalStateException(
String.format("No tag found for version %s of project %s, aborting.", artifactVersion, project));
}
try (Git git = new Git(getRepository(module.getProject()))) { try (Git git = new Git(getRepository(module.getProject()))) {
@@ -397,6 +393,29 @@ public class GitOperations {
}); });
} }
public void removeTags(TrainIteration iteration) {
ExecutionUtils.run(iteration, module -> {
Project project = module.getProject();
ArtifactVersion artifactVersion = ArtifactVersion.of(module);
Optional<Tag> tag = findTagFor(project, artifactVersion);
if (!tag.isPresent()) {
logger.log(module, "No tag %s found project %s, skipping.", artifactVersion, project);
return;
}
try (Git git = new Git(getRepository(module.getProject()))) {
logger.log(module, "git tag -D %s", tag.get());
git.tagDelete().setTags(tag.get().toString()).call();
}
});
}
private Branch createMaintenanceBranch(ModuleIteration module) throws Exception { private Branch createMaintenanceBranch(ModuleIteration module) throws Exception {
try (Git git = new Git(getRepository(module.getProject()))) { try (Git git = new Git(getRepository(module.getProject()))) {
@@ -447,12 +466,11 @@ public class GitOperations {
* @return * @return
* @throws IOException * @throws IOException
*/ */
private Tag findTagFor(Project project, ArtifactVersion version) { private Optional<Tag> findTagFor(Project project, ArtifactVersion version) {
return getTags(project).stream().// return getTags(project).stream().//
filter(tag -> tag.toArtifactVersion().map(it -> it.equals(version)).orElse(false)).// filter(tag -> tag.toArtifactVersion().map(it -> it.equals(version)).orElse(false)).//
findFirst().orElseThrow(() -> new IllegalArgumentException( findFirst();
String.format("No tag found for version %s of project %s!", version, project)));
} }
private Repository getRepository(Project project) throws IOException { private Repository getRepository(Project project) throws IOException {