Capture all changes for Tag body of GA version.

spring-projects · Nov 17, 2023 · 2079a55 · 2079a55
1 parent 61cc755
commit 2079a55
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/org/springframework/data/release/git/GitOperations.java b/src/main/java/org/springframework/data/release/git/GitOperations.java
@@ -442,6 +442,10 @@ public TrainIteration getPreviousIteration(TrainIteration trainIteration) {
 			return trainToUse.getIteration(Iteration.GA);
 		}
 
+		if(trainIteration.getIteration().isGAIteration()) {
+			return getPreviousTrain(trainIteration).getIteration(Iteration.GA);
+		}
+
 		Optional<TrainIteration> mostRecentBefore = getTags(Projects.BUILD) //
 				.filter((tag, ti) -> ti.getTrain().equals(trainIteration.getTrain())) //
 				.find((tag, iteration) -> iteration.getIteration().compareTo(trainIteration.getIteration()) < 0,

diff --git a/src/test/java/org/springframework/data/release/git/GitOperationsIntegrationTests.java b/src/test/java/org/springframework/data/release/git/GitOperationsIntegrationTests.java
@@ -84,8 +84,8 @@ void shouldDeterminePreviousIterationFromGA() throws Exception {
 
 		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));