From 95c6d2cf12104b3f4162ac4a82311b00969851c6 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 18 Nov 2022 14:55:01 +0100 Subject: [PATCH] Push maintenance branches on GA release. --- .../data/release/issues/github/GitHubCommands.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/org/springframework/data/release/issues/github/GitHubCommands.java b/src/main/java/org/springframework/data/release/issues/github/GitHubCommands.java index 68a3027..8ffea28 100644 --- a/src/main/java/org/springframework/data/release/issues/github/GitHubCommands.java +++ b/src/main/java/org/springframework/data/release/issues/github/GitHubCommands.java @@ -29,6 +29,7 @@ import org.springframework.data.release.TimedCommand; import org.springframework.data.release.git.GitOperations; import org.springframework.data.release.issues.IssueTracker; import org.springframework.data.release.issues.TicketReference; +import org.springframework.data.release.model.Iteration; import org.springframework.data.release.model.Project; import org.springframework.data.release.model.Tracker; import org.springframework.data.release.model.TrainIteration; @@ -64,6 +65,11 @@ public class GitHubCommands extends TimedCommand { retry(() -> { git.push(iteration); git.pushTags(iteration.getTrain()); + + if (!iteration.getTrain().isAlwaysUseBranch() && iteration.getIteration().isGAIteration()) { + git.push(new TrainIteration(iteration.getTrain(), Iteration.SR1)); + } + createOrUpdateRelease(iteration); }, 2); }