Skip to content

Commit 2079a55

Browse files
Capture all changes for Tag body of GA version.
1 parent 61cc755 commit 2079a55

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/main/java/org/springframework/data/release/git/GitOperations.java

+4
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,10 @@ public TrainIteration getPreviousIteration(TrainIteration trainIteration) {
442442
return trainToUse.getIteration(Iteration.GA);
443443
}
444444

445+
if(trainIteration.getIteration().isGAIteration()) {
446+
return getPreviousTrain(trainIteration).getIteration(Iteration.GA);
447+
}
448+
445449
Optional<TrainIteration> mostRecentBefore = getTags(Projects.BUILD) //
446450
.filter((tag, ti) -> ti.getTrain().equals(trainIteration.getTrain())) //
447451
.find((tag, iteration) -> iteration.getIteration().compareTo(trainIteration.getIteration()) < 0,

src/test/java/org/springframework/data/release/git/GitOperationsIntegrationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ void shouldDeterminePreviousIterationFromGA() throws Exception {
8484

8585
TrainIteration hopperRc1 = gitOperations.getPreviousIteration(ReleaseTrains.HOPPER.getIteration(Iteration.GA));
8686

87-
assertThat(hopperRc1.getTrain()).isEqualTo(ReleaseTrains.HOPPER);
88-
assertThat(hopperRc1.getIteration()).isEqualTo(Iteration.RC1);
87+
assertThat(hopperRc1.getTrain()).isEqualTo(ReleaseTrains.GOSLING);
88+
assertThat(hopperRc1.getIteration()).isEqualTo(Iteration.GA);
8989

9090
TrainIteration hopperM1 = gitOperations.getPreviousIteration(ReleaseTrains.HOPPER.getIteration(Iteration.RC1));
9191

0 commit comments

Comments
 (0)