From 7e3443bff658172710b85e9c4ba3aeca73f1e0c4 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Thu, 23 May 2024 16:10:26 -0400 Subject: [PATCH] Add gradle command to build antora --- .../releaser/internal/ReleaserProperties.java | 18 +++++++++++++++++- .../project/ProjectCommandExecutor.java | 4 +++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java b/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java index 9a33fbce..4c9e022a 100644 --- a/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java +++ b/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java @@ -1113,6 +1113,9 @@ public class ReleaserProperties implements Serializable { private String generateReleaseTrainDocsCommand = "bash release_train.sh " + "--retrieveversions --version {{version}} --ghpages --auto"; + /** + * Command to be executed to run Antora. + */ private String runAntoraCommand = "./mvnw antora {{systemProps}}"; /** @@ -1418,6 +1421,11 @@ public class ReleaserProperties implements Serializable { */ private long waitTimeInMinutes = 20; + /** + * Command to be executed to run Antora. + */ + private String runAntoraCommand = "./gradlew antora {{systemProps}}"; + @Override public String getBuildCommand() { return this.buildCommand; @@ -1502,6 +1510,14 @@ public class ReleaserProperties implements Serializable { this.ignoredGradleRegex = ignoredGradleRegex; } + public String getRunAntoraCommand() { + return runAntoraCommand; + } + + public void setRunAntoraCommand(String runAntoraCommand) { + this.runAntoraCommand = runAntoraCommand; + } + @Override public String toString() { return new StringJoiner(", ", Gradle.class.getSimpleName() + "[", "]") @@ -1511,10 +1527,10 @@ public class ReleaserProperties implements Serializable { .add("deployGuidesCommand='" + deployGuidesCommand + "'") .add("publishDocsCommand=" + publishDocsCommand) .add("generateReleaseTrainDocsCommand='" + generateReleaseTrainDocsCommand + "'") + .add("runAntoraCommand='" + runAntoraCommand + "'") .add("systemProperties='" + systemProperties + "'").add("waitTimeInMinutes=" + waitTimeInMinutes) .toString(); } - } public static class Sagan implements Serializable { diff --git a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java index 40f2fbcc..ff507ddf 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -335,7 +335,9 @@ class CommandPicker { } String runAntoraCommand(ProjectVersion version) { - // TODO handle gradle and bash? + if (projectType == ProjectType.GRADLE) { + return gradleCommandWithSystemProps(releaserProperties.getGradle().getRunAntoraCommand()); + } return mavenCommandWithSystemProps(releaserProperties.getMaven().getRunAntoraCommand(), version); }