diff --git a/ci/build-and-distribute.bash b/ci/build-and-distribute.bash index 39f4a03..183096a 100755 --- a/ci/build-and-distribute.bash +++ b/ci/build-and-distribute.bash @@ -40,6 +40,6 @@ fi echo "About to push and distribute ${VERSION}." -sed "s|\${VERSION}|${VERSION}|g" < ci/push-and-distribute.template > target/push-and-distribute.shell +sed "s|\${VERSION}|${VERSION}|g" < ci/build-and-distribute.template > target/build-and-distribute.shell spring-data-release-shell diff --git a/ci/build-and-distribute.template b/ci/build-and-distribute.template index 56f5eeb..da643b0 100755 --- a/ci/build-and-distribute.template +++ b/ci/build-and-distribute.template @@ -1,3 +1,4 @@ workspace cleanup +git update ${VERSION} release build ${VERSION} release distribute ${VERSION} diff --git a/readme.adoc b/readme.adoc index 34f4726..df8e23e 100644 --- a/readme.adoc +++ b/readme.adoc @@ -51,7 +51,7 @@ The <> phase is what's covered by the CI |🚨 *To trigger 🛣 the release* `git push` the `release` branch |`$ git push origin release` -|Go to https://jenkins.spring.io/view/SpringData/job/spring-data-release-release/, Navigate to the `release` branch. +|Go to https://jenkins.spring.io/view/SpringData/job/spring-data-release/job/release, Navigate to the `release` branch. A job should have started. Click on the active job, and then click on *Open Blue Ocean*. | Monitor the release process. diff --git a/src/main/java/org/springframework/data/release/build/BuildCommands.java b/src/main/java/org/springframework/data/release/build/BuildCommands.java index c5b0236..406a1be 100644 --- a/src/main/java/org/springframework/data/release/build/BuildCommands.java +++ b/src/main/java/org/springframework/data/release/build/BuildCommands.java @@ -81,7 +81,7 @@ class BuildCommands extends TimedCommand { project.ifPresent(it -> build.triggerBuild(iteration.getModule(it))); if (!project.isPresent()) { - iteration.forEach(build::triggerBuild); + build.build(iteration); } } diff --git a/src/main/java/org/springframework/data/release/git/GitCommands.java b/src/main/java/org/springframework/data/release/git/GitCommands.java index 7485701..47fab78 100644 --- a/src/main/java/org/springframework/data/release/git/GitCommands.java +++ b/src/main/java/org/springframework/data/release/git/GitCommands.java @@ -69,9 +69,9 @@ class GitCommands extends TimedCommand { } @CliCommand("git update") - public void update(@CliOption(key = { "", "train" }, mandatory = true) String trainName) + public void update(@CliOption(key = { "", "train" }, mandatory = true) TrainIteration iteration) throws Exception, InterruptedException { - git.update(ReleaseTrains.getTrainByName(trainName)); + git.update(iteration.getTrain()); } @CliCommand("git tags")