Polishing.

Rename documentation command to release documentation.

Also, retain milestone repos for RC builds.
This commit is contained in:
Mark Paluch
2023-09-15 15:51:59 +02:00
parent 88b2ad3a3a
commit ed3fa6dbc6
4 changed files with 32 additions and 27 deletions

View File

@@ -146,7 +146,7 @@ Both are available in the Spring/Pivotal Last Pass repository.
2+| *Post-release tasks*
|Close JIRA tickets and GitHub release tickets. |`$ tracker close $trainIteration`
|Create new release versions and tickets for upcoming version |`$ tracker setup-next $trainIteration.next`
|Trigger Antora documentation build (once all artifacts have arrived at the final Maven repository) |`$ github trigger documentation $trainIteration`
|Trigger Antora documentation build (once all artifacts have arrived at the final Maven repository) |`$ release documentation $trainIteration`
|Update versions in Projects Service. `$releaseTrains` is given as comma separated lists of code names, without spaces. E.g. `Moore,Neumann` |`$ projects update $releaseTrains`
|Create list of docs for release announcements |`$ announcement $trainIteration`
|===

View File

@@ -26,6 +26,7 @@ import java.util.Collections;
import java.util.List;
import org.springframework.data.release.model.ArtifactVersion;
import org.springframework.data.release.model.Iteration;
import org.springframework.data.release.model.Phase;
import org.springframework.data.release.model.Project;
import org.springframework.data.release.model.TrainIteration;
@@ -91,7 +92,8 @@ public class UpdateInformation {
if (phase == Phase.PREPARE) {
if (train.getIteration().isMilestone()) {
Iteration iteration = train.getIteration();
if (iteration.isMilestone() || iteration.isReleaseCandidate()) {
return Collections.singletonList(Repository.MILESTONE);
}
}

View File

@@ -22,6 +22,10 @@ import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.experimental.FieldDefaults;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import org.springframework.data.release.CliComponent;
import org.springframework.data.release.TimedCommand;
import org.springframework.data.release.build.BuildOperations;
@@ -219,6 +223,28 @@ class ReleaseCommands extends TimedCommand {
}
}
@CliCommand(value = "release documentation")
public void triggerDocumentation(@CliOption(key = "", mandatory = true) TrainIteration iteration,
@CliOption(key = "module", mandatory = false) String module) {
Set<Project> skip = new HashSet<>(Arrays.asList(Projects.BOM, Projects.BUILD, Projects.R2DBC, Projects.JDBC,
Projects.SOLR, Projects.GEODE, Projects.SMOKE_TESTS));
iteration.forEach(it -> {
Project project = it.getProject();
if (skip.contains(project)) {
return;
}
if (module == null || module.equalsIgnoreCase(project.getName())) {
gitHub.triggerAntoraWorkflow(project);
}
});
}
private void setupMaintenanceVersions(TrainIteration iteration) throws Exception {
// Set project version to maintenance once

View File

@@ -20,10 +20,7 @@ import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.experimental.FieldDefaults;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.Executor;
import java.util.stream.Collectors;
@@ -34,7 +31,6 @@ import org.springframework.data.release.issues.IssueTracker;
import org.springframework.data.release.issues.TicketReference;
import org.springframework.data.release.model.Iteration;
import org.springframework.data.release.model.Project;
import org.springframework.data.release.model.Projects;
import org.springframework.data.release.model.Tracker;
import org.springframework.data.release.model.TrainIteration;
import org.springframework.data.release.utils.ExecutionUtils;
@@ -94,26 +90,7 @@ public class GitHubCommands extends TimedCommand {
});
}
@CliCommand(value = "github trigger documentation")
public void triggerDocumentation(@CliOption(key = "", mandatory = true) TrainIteration iteration,
@CliOption(key = "module", mandatory = false) String module) {
Set<Project> skip = new HashSet<>(Arrays.asList(Projects.BOM, Projects.BUILD, Projects.R2DBC, Projects.JDBC,
Projects.SOLR, Projects.GEODE, Projects.SMOKE_TESTS));
iteration.forEach(it -> {
Project project = it.getProject();
if (skip.contains(project)) {
return;
}
if (module == null || module.equalsIgnoreCase(project.getName())) {
gitHub.triggerAntoraWorkflow(project);
}
});
public void triggerAntoraWorkflow(Project project) {
gitHub.triggerAntoraWorkflow(project);
}
}