SpringCloud/spring-cloud-release-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #259 from ryanjbaxter/publish-antora-docs

Browse Source 
Fix command split
This commit is contained in:
Ryan Baxter
2024-05-09 16:09:16 -04:00
committed by GitHub
parent 672e6ad4c4 1a346a6d90
commit d8732fffae
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
releaser-core/src/main/java/releaser/internal/git/GitRepo.java
View File

@@ -186,7 +186,7 @@ class GitRepo {
void checkoutTag(String tagName) {
try (Git git = this.gitFactory.open(file(this.basedir))) {
Optional<ObjectId> tagId = findTagIdByName(tagName, true);
Optional<ObjectId> tagId = findTagIdByName(tagName, false);
if (tagId.isPresent()) {
git.checkout().setName(tagId.get().getName()).call();
}

9
releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java
View File

@@ -182,6 +182,13 @@ public class ProjectCommandExecutor {
public void publishAntoraDocs(File antoraDocsProject, File project, ReleaserProperties properties) {
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
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(" "));
}
@@ -336,7 +343,7 @@ class CommandPicker {
String repo = properties.getGit().getOrgName() + "/" + version.projectName;
// TODO this needs to be a property
return bashCommandWithSystemProps("./rsync-antora-reference/src/action.sh"
+ " --docs-username \"$DOCS_SERVER_SSH_USER\" --docs-host \"docs.spring.io\" --docs-ssh-key \"$(cat $DOCS_SERVER_SSH_KEY)\" --docs-ssh-host-key \"#\" --site-path \""
+ " --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 {{systemProps}}");
}