Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Capture all changes for Tag body of GA version. #71

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Capture all changes for Tag body of GA version. #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/main/java/org/springframework/data/release/git/GitOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ public TrainIteration getPreviousIteration(TrainIteration trainIteration) {

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);
Expand Down Expand Up @@ -546,6 +546,10 @@ private static Train getPreviousTrain(TrainIteration trainIteration) {
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 -> {
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/springframework/data/release/git/GitOperationsIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down