diff --git a/projects/spring-cloud/src/main/resources/application.yml b/projects/spring-cloud/src/main/resources/application.yml index 5c43ef3a..41bef052 100644 --- a/projects/spring-cloud/src/main/resources/application.yml +++ b/projects/spring-cloud/src/main/resources/application.yml @@ -104,7 +104,7 @@ releaser: antora: spring-docs-actions-url: https://github.com/spring-io/spring-doc-actions spring-docs-actions-tag: v0.0.16 - sync-antora-docs-command: "./rsync-antora-reference/src/action.sh" + sync-antora-docs-command: "./action.sh" meta-release: enabled: false release-train-project-name: spring-cloud-release diff --git a/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java b/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java index e129ad27..771a456f 100644 --- a/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java +++ b/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java @@ -1178,8 +1178,8 @@ public class ReleaserProperties implements Serializable { public String toString() { return "Maven{" + "buildCommand='" + this.buildCommand + '\'' + ", deployCommand='" + this.deployCommand + '\'' + ", publishDocsCommand=" + this.publishDocsCommand + "generateReleaseTrainDocsCommand='" - + this.generateReleaseTrainDocsCommand + '\'' + ", runAntoraCommand= " - + runAntoraCommand + ", waitTimeInMinutes=" + this.waitTimeInMinutes + '}'; + + this.generateReleaseTrainDocsCommand + '\'' + ", runAntoraCommand= " + runAntoraCommand + + ", waitTimeInMinutes=" + this.waitTimeInMinutes + '}'; } } 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 06cce382..daae1fe5 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -183,13 +183,13 @@ public class ProjectCommandExecutor { String command = new CommandPicker(properties).publishAntoraDocsCommand(project, properties); log.info("Executing command for publishing Antora docs " + command + " / " + properties); String[] commands = command.split(" "); - //TODO fix this hack + // TODO fix this hack for (int i = 0; i < commands.length; i++) { if (commands[i].contains("{{cat-key}}")) { commands[i] = commands[i].replace("{{cat-key}}", "\"$(cat $DOCS_SERVER_SSH_KEY)\""); } } - runCommand(properties, antoraDocsProject.getAbsolutePath(), command.split(" ")); + runCommand(properties, antoraDocsProject.getAbsolutePath() + "/rsync-antora-reference/src", command.split(" ")); } public void publishDocs(ReleaserProperties properties, ProjectVersion originalVersion, @@ -342,10 +342,9 @@ class CommandPicker { ProjectVersion version = new ProjectVersion(project); String repo = properties.getGit().getOrgName() + "/" + version.projectName; // TODO this needs to be a property - return "./rsync-antora-reference/src/action.sh" + return "./action.sh" + " --docs-username \"$DOCS_SERVER_SSH_USER\" --docs-host \"docs.spring.io\" --docs-ssh-key {{cat-key}} --docs-ssh-host-key \"#\" --site-path \"" - + project.getAbsolutePath() + "/target/antora/site\" --github-repository \"" + repo - + "\" --dry-run"; + + project.getAbsolutePath() + "/target/antora/site\" --github-repository \"" + repo + "\" --dry-run"; } String version() {