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

Mention all changes for GA releases on GitHub release page.

Browse Source 
Closes #70
This commit is contained in:
Christoph Strobl
2023-11-17 10:45:32 +01:00
committed by Mark Paluch
parent f1f37b4693
commit b1a30f90b5
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -436,7 +436,7 @@ public class GitOperations {
Assert.notNull(trainIteration, "TrainIteration must not be null!");
if (trainIteration.getIteration().isMilestone() && trainIteration.getIteration().getIterationValue() == 1) {
if (isGaOrFirstMilestone(trainIteration.getIteration())) {
Train trainToUse = getPreviousTrain(trainIteration);
return trainToUse.getIteration(Iteration.GA);
@@ -546,6 +546,10 @@ public class GitOperations {
return trainToUse;
}
private static boolean isGaOrFirstMilestone(Iteration iteration) {
return iteration.isGAIteration() || (iteration.isMilestone() && iteration.getIterationValue() == 1);
}
private Stream<Branch> getRemoteBranches(Project project) {
return doWithGit(project, git -> {

4
src/test/java/org/springframework/data/release/git/GitOperationsIntegrationTests.java
View File

@@ -84,8 +84,8 @@ class GitOperationsIntegrationTests extends AbstractIntegrationTests {
TrainIteration hopperRc1 = gitOperations.getPreviousIteration(ReleaseTrains.HOPPER.getIteration(Iteration.GA));
assertThat(hopperRc1.getTrain()).isEqualTo(ReleaseTrains.HOPPER);
assertThat(hopperRc1.getIteration()).isEqualTo(Iteration.RC1);
assertThat(hopperRc1.getTrain()).isEqualTo(ReleaseTrains.GOSLING);
assertThat(hopperRc1.getIteration()).isEqualTo(Iteration.GA);
TrainIteration hopperM1 = gitOperations.getPreviousIteration(ReleaseTrains.HOPPER.getIteration(Iteration.RC1));