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

Update command to create branches.

Browse Source 
Closes #100
This commit is contained in:
Mark Paluch
2024-11-15 10:20:15 +01:00
parent 3c3f32394e
commit 7f39ecfe16
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/springframework/data/release/cli/ReleaseCommands.java
View File

@@ -35,6 +35,7 @@ import org.springframework.data.release.git.GitOperations;
import org.springframework.data.release.issues.IssueTrackerCommands;
import org.springframework.data.release.issues.github.GitHubCommands;
import org.springframework.data.release.misc.ReleaseOperations;
import org.springframework.data.release.model.Iteration;
import org.springframework.data.release.model.ModuleIteration;
import org.springframework.data.release.model.Phase;
import org.springframework.data.release.model.Project;
@@ -203,7 +204,8 @@ class ReleaseCommands extends TimedCommand {
if (iteration.getIteration().isGAIteration()) {
// Create bugfix branches
BranchMapping branches = git.createMaintenanceBranches(iteration, true);
BranchMapping branches = git.createMaintenanceBranches(iteration,
iteration.getTrain().getIteration(Iteration.SR1));
// Set project version to maintenance once
setupMaintenanceVersions(iteration, branches);
@@ -212,18 +214,19 @@ class ReleaseCommands extends TimedCommand {
}
@CliCommand(value = "release create-branches")
public void createBranches(@CliOption(key = "", mandatory = true) TrainIteration iteration) throws Exception {
public void createBranches(@CliOption(key = "from", mandatory = true) TrainIteration from,
@CliOption(key = "from", mandatory = true) TrainIteration to) throws Exception {
if (!iteration.getTrain().isAlwaysUseBranch()) {
if (!to.getTrain().isAlwaysUseBranch()) {
throw new IllegalArgumentException(
String.format("Cannot create branches as train %s does not use branches.", iteration.getTrain().getCalver()));
String.format("Cannot create branches as train %s does not use branches.", to.getTrain().getCalver()));
}
// Create bugfix branches
BranchMapping branchMapping = git.createMaintenanceBranches(iteration, false);
BranchMapping branchMapping = git.createMaintenanceBranches(from, to);
// Set project version to maintenance once
setupMaintenanceVersions(iteration, branchMapping);
setupMaintenanceVersions(to, branchMapping);
}
@CliCommand(value = "release documentation")

17
src/main/java/org/springframework/data/release/git/GitOperations.java
View File

@@ -926,26 +926,25 @@ public class GitOperations {
logger.log(project, "Checkout done!");
}
public BranchMapping createMaintenanceBranches(TrainIteration iteration, boolean checkout) {
public BranchMapping createMaintenanceBranches(TrainIteration from, TrainIteration to) {
if (checkout && !iteration.getIteration().isGAIteration()) {
if (!from.getIteration().isGAIteration()) {
return BranchMapping.NONE;
}
if (checkout) {
checkout(iteration);
}
checkout(from);
return createBranch(iteration);
return createBranch(from, to);
}
public BranchMapping createBranch(TrainIteration iteration) {
public BranchMapping createBranch(TrainIteration from, TrainIteration to) {
BranchMapping branches = new BranchMapping();
ExecutionUtils.run(executor, iteration, module -> {
ExecutionUtils.run(executor, to, module -> {
Branch current = getCurrentBranch(module);
ModuleIteration fromIteration = from.getModule(module.getProject());
Branch current = from.getIteration().isGAIteration() ? Branch.MAIN : Branch.from(fromIteration.getVersion());
Branch newBranch = createBranch(module);
checkout(module.getSupportedProject(), newBranch, BranchCheckoutMode.CREATE_ONLY);