From e6972772be6699035dee2ab3e20e30f28db13ea1 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Thu, 9 May 2024 13:22:54 -0400 Subject: [PATCH 01/33] Add new code to sync antora docs --- .../src/main/resources/application.yml | 4 + .../projects/spring-docs-actions/.gitignore | 16 ++ .../spring-docs-actions/git/COMMIT_EDITMSG | 1 + .../projects/spring-docs-actions/git/HEAD | 1 + .../projects/spring-docs-actions/git/config | 7 + .../spring-docs-actions/git/description | 1 + .../git/hooks/applypatch-msg.sample | 15 ++ .../git/hooks/commit-msg.sample | 24 +++ .../git/hooks/fsmonitor-watchman.sample | 174 ++++++++++++++++++ .../git/hooks/post-update.sample | 8 + .../git/hooks/pre-applypatch.sample | 14 ++ .../git/hooks/pre-commit.sample | 49 +++++ .../git/hooks/pre-merge-commit.sample | 13 ++ .../git/hooks/pre-push.sample | 53 ++++++ .../git/hooks/pre-rebase.sample | 169 +++++++++++++++++ .../git/hooks/pre-receive.sample | 24 +++ .../git/hooks/prepare-commit-msg.sample | 42 +++++ .../git/hooks/push-to-checkout.sample | 78 ++++++++ .../git/hooks/sendemail-validate.sample | 77 ++++++++ .../git/hooks/update.sample | 128 +++++++++++++ .../projects/spring-docs-actions/git/index | Bin 0 -> 324 bytes .../spring-docs-actions/git/info/exclude | 6 + .../spring-docs-actions/git/logs/HEAD | 4 + .../git/logs/refs/heads/main | 4 + .../0d/0095113b5be7f4fcdfc972268318ec902c5f13 | 2 + .../0d/65649266e723e7033103f9b6ae757ec6580057 | 2 + .../0f/5f2470dfcc0e605318d3559a527b90d3200f4d | Bin 0 -> 46 bytes .../18/c66e805702c81fc2099cb09d2490f099581f34 | 1 + .../19/3a7a691db1f7529bbd1d7f7f4947209622486c | 1 + .../31/914a902c49e2929047e4d716ea82715c6c403f | Bin 0 -> 54 bytes .../35/1ea40513b59a752d40d50fd5e5fc303a6d8e3a | Bin 0 -> 54 bytes .../5b/13c12d6cbaae95d5c70435559222c9e531d9a5 | Bin 0 -> 104 bytes .../64/cdce59318eb9c6b81014c4fe0339ab48bbbbc2 | Bin 0 -> 103 bytes .../6f/646e4b35f6aa83ed6d70b74a0d50f7681cb5cd | Bin 0 -> 73 bytes .../75/5f221a5212015576ede283e6a0f3ce477c238f | Bin 0 -> 156 bytes .../88/9850e6e4256269c906a85b252073b9b71deb1d | Bin 0 -> 88 bytes .../8d/b262c5ba9b96d3a26a5e2b133f131194e4f915 | Bin 0 -> 115 bytes .../91/e848d9a61fd19a78000bc9ac424d1295276f68 | Bin 0 -> 48 bytes .../a3/ffcc384822decb6bc5599bb29a74bbf22dc45e | 2 + .../ae/f837338280bc8fe836d413402a84ec43a712fe | Bin 0 -> 103 bytes .../b7/3656050139102621603351260c98d73f1c7288 | Bin 0 -> 45 bytes .../bb/4e47ec1aa0b5a2dec0ede431ed10577f98c7ef | Bin 0 -> 54 bytes .../c1/eb48842df92c8f185796de35a43f789363eeab | Bin 0 -> 157 bytes .../c7/c3fa38fd33170e7fbb15541066ebe746ba1ad6 | 1 + .../d7/cd2a877e4a6950d6a496bcd3d2be5ab6ca6724 | Bin 0 -> 45 bytes .../spring-docs-actions/git/refs/heads/main | 1 + .../spring-docs-actions/git/refs/tags/v0.0.16 | 1 + .../rsync-antora-reference/src/action.sh | 4 + .../main/java/releaser/internal/Releaser.java | 21 ++- .../releaser/internal/ReleaserProperties.java | 79 +++++++- .../java/releaser/internal/git/GitRepo.java | 15 ++ .../internal/git/ProjectGitHandler.java | 32 +++- .../project/ProjectCommandExecutor.java | 34 ++++ .../tasks/release/PublishDocsReleaseTask.java | 5 +- .../internal/buildsystem/TestUtils.java | 1 + .../releaser/internal/spring/ArgsBuilder.java | 4 + 56 files changed, 1105 insertions(+), 13 deletions(-) create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/.gitignore create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/COMMIT_EDITMSG create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/HEAD create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/config create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/description create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/applypatch-msg.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/commit-msg.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/fsmonitor-watchman.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/post-update.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-applypatch.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-commit.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-merge-commit.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-push.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-rebase.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-receive.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/prepare-commit-msg.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/push-to-checkout.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/sendemail-validate.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/update.sample create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/index create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/info/exclude create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/HEAD create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/refs/heads/main create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/0d/0095113b5be7f4fcdfc972268318ec902c5f13 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/0d/65649266e723e7033103f9b6ae757ec6580057 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/0f/5f2470dfcc0e605318d3559a527b90d3200f4d create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/18/c66e805702c81fc2099cb09d2490f099581f34 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/19/3a7a691db1f7529bbd1d7f7f4947209622486c create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/31/914a902c49e2929047e4d716ea82715c6c403f create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/35/1ea40513b59a752d40d50fd5e5fc303a6d8e3a create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/5b/13c12d6cbaae95d5c70435559222c9e531d9a5 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/64/cdce59318eb9c6b81014c4fe0339ab48bbbbc2 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/6f/646e4b35f6aa83ed6d70b74a0d50f7681cb5cd create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/75/5f221a5212015576ede283e6a0f3ce477c238f create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/88/9850e6e4256269c906a85b252073b9b71deb1d create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/8d/b262c5ba9b96d3a26a5e2b133f131194e4f915 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/91/e848d9a61fd19a78000bc9ac424d1295276f68 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/a3/ffcc384822decb6bc5599bb29a74bbf22dc45e create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/ae/f837338280bc8fe836d413402a84ec43a712fe create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/b7/3656050139102621603351260c98d73f1c7288 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/bb/4e47ec1aa0b5a2dec0ede431ed10577f98c7ef create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/c1/eb48842df92c8f185796de35a43f789363eeab create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/c7/c3fa38fd33170e7fbb15541066ebe746ba1ad6 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/d7/cd2a877e4a6950d6a496bcd3d2be5ab6ca6724 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/refs/heads/main create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/refs/tags/v0.0.16 create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/rsync-antora-reference/src/action.sh diff --git a/projects/spring-cloud/src/main/resources/application.yml b/projects/spring-cloud/src/main/resources/application.yml index c840cfdd..5c43ef3a 100644 --- a/projects/spring-cloud/src/main/resources/application.yml +++ b/projects/spring-cloud/src/main/resources/application.yml @@ -101,6 +101,10 @@ releaser: all-versions-file-url: https://raw.githubusercontent.com/spring-io/start.spring.io/main/start-site/src/main/resources/application.yml bom-name: spring-cloud # fixed-versions: + 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" meta-release: enabled: false release-train-project-name: spring-cloud-release diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/.gitignore b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/.gitignore new file mode 100644 index 00000000..8db262c5 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/.gitignore @@ -0,0 +1,16 @@ +*~ +#* +*# +.#* +.classpath +.project +.settings/ +.springBeans +target/ +_site/ +.idea +*.iml +*.ipr +.factorypath +*.swp +/consul \ No newline at end of file diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/COMMIT_EDITMSG b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/COMMIT_EDITMSG new file mode 100644 index 00000000..0406423b --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/COMMIT_EDITMSG @@ -0,0 +1 @@ +updating action diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/HEAD b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/HEAD new file mode 100644 index 00000000..b870d826 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/main diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/config b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/config new file mode 100644 index 00000000..6c9406b7 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/config @@ -0,0 +1,7 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/description b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/description new file mode 100644 index 00000000..498b267a --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/applypatch-msg.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/applypatch-msg.sample new file mode 100755 index 00000000..a5d7b84a --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/commit-msg.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/commit-msg.sample new file mode 100755 index 00000000..b58d1184 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/fsmonitor-watchman.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/fsmonitor-watchman.sample new file mode 100755 index 00000000..23e856f5 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/fsmonitor-watchman.sample @@ -0,0 +1,174 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 2) and last update token +# formatted as a string and outputs to stdout a new update token and +# all files that have been modified since the update token. Paths must +# be relative to the root of the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $last_update_token) = @ARGV; + +# Uncomment for debugging +# print STDERR "$0 $version $last_update_token\n"; + +# Check the hook interface version +if ($version ne 2) { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree = get_working_dir(); + +my $retry = 1; + +my $json_pkg; +eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; +} or do { + require JSON::PP; + $json_pkg = "JSON::PP"; +}; + +launch_watchman(); + +sub launch_watchman { + my $o = watchman_query(); + if (is_work_tree_watched($o)) { + output_result($o->{clock}, @{$o->{files}}); + } +} + +sub output_result { + my ($clockid, @files) = @_; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # binmode $fh, ":utf8"; + # print $fh "$clockid\n@files\n"; + # close $fh; + + binmode STDOUT, ":utf8"; + print $clockid; + print "\0"; + local $, = "\0"; + print @files; +} + +sub watchman_clock { + my $response = qx/watchman clock "$git_work_tree"/; + die "Failed to get clock id on '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + return $json_pkg->new->utf8->decode($response); +} + +sub watchman_query { + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $last_update_token but not from the .git folder. + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + my $last_update_line = ""; + if (substr($last_update_token, 0, 1) eq "c") { + $last_update_token = "\"$last_update_token\""; + $last_update_line = qq[\n"since": $last_update_token,]; + } + my $query = <<" END"; + ["query", "$git_work_tree", {$last_update_line + "fields": ["name"], + "expression": ["not", ["dirname", ".git"]] + }] + END + + # Uncomment for debugging the watchman query + # open (my $fh, ">", ".git/watchman-query.json"); + # print $fh $query; + # close $fh; + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + # Uncomment for debugging the watch response + # open ($fh, ">", ".git/watchman-response.json"); + # print $fh $response; + # close $fh; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + return $json_pkg->new->utf8->decode($response); +} + +sub is_work_tree_watched { + my ($output) = @_; + my $error = $output->{error}; + if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + $retry--; + my $response = qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + $output = $json_pkg->new->utf8->decode($response); + $error = $output->{error}; + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # close $fh; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + my $o = watchman_clock(); + $error = $output->{error}; + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + output_result($o->{clock}, ("/")); + $last_update_token = $o->{clock}; + + eval { launch_watchman() }; + return 0; + } + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + return 1; +} + +sub get_working_dir { + my $working_dir; + if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $working_dir = Win32::GetCwd(); + $working_dir =~ tr/\\/\//; + } else { + require Cwd; + $working_dir = Cwd::cwd(); + } + + return $working_dir; +} diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/post-update.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/post-update.sample new file mode 100755 index 00000000..ec17ec19 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-applypatch.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-applypatch.sample new file mode 100755 index 00000000..4142082b --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-commit.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-commit.sample new file mode 100755 index 00000000..29ed5ee4 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff-index --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-merge-commit.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-merge-commit.sample new file mode 100755 index 00000000..399eab19 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-push.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-push.sample new file mode 100755 index 00000000..4ce688d3 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +zero=$(git hash-object --stdin &2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-rebase.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-rebase.sample new file mode 100755 index 00000000..6cbef5c3 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-receive.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-receive.sample new file mode 100755 index 00000000..a1fd29ec --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/prepare-commit-msg.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/prepare-commit-msg.sample new file mode 100755 index 00000000..10fa14c5 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/push-to-checkout.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/push-to-checkout.sample new file mode 100755 index 00000000..af5a0c00 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/push-to-checkout.sample @@ -0,0 +1,78 @@ +#!/bin/sh + +# An example hook script to update a checked-out tree on a git push. +# +# This hook is invoked by git-receive-pack(1) when it reacts to git +# push and updates reference(s) in its repository, and when the push +# tries to update the branch that is currently checked out and the +# receive.denyCurrentBranch configuration variable is set to +# updateInstead. +# +# By default, such a push is refused if the working tree and the index +# of the remote repository has any difference from the currently +# checked out commit; when both the working tree and the index match +# the current commit, they are updated to match the newly pushed tip +# of the branch. This hook is to be used to override the default +# behaviour; however the code below reimplements the default behaviour +# as a starting point for convenient modification. +# +# The hook receives the commit with which the tip of the current +# branch is going to be updated: +commit=$1 + +# It can exit with a non-zero status to refuse the push (when it does +# so, it must not modify the index or the working tree). +die () { + echo >&2 "$*" + exit 1 +} + +# Or it can make any necessary changes to the working tree and to the +# index to bring them to the desired state when the tip of the current +# branch is updated to the new commit, and exit with a zero status. +# +# For example, the hook can simply run git read-tree -u -m HEAD "$1" +# in order to emulate git fetch that is run in the reverse direction +# with git push, as the two-tree form of git read-tree -u -m is +# essentially the same as git switch or git checkout that switches +# branches while keeping the local changes in the working tree that do +# not interfere with the difference between the branches. + +# The below is a more-or-less exact translation to shell of the C code +# for the default behaviour for git's push-to-checkout hook defined in +# the push_to_deploy() function in builtin/receive-pack.c. +# +# Note that the hook will be executed from the repository directory, +# not from the working tree, so if you want to perform operations on +# the working tree, you will have to adapt your code accordingly, e.g. +# by adding "cd .." or using relative paths. + +if ! git update-index -q --ignore-submodules --refresh +then + die "Up-to-date check failed" +fi + +if ! git diff-files --quiet --ignore-submodules -- +then + die "Working directory has unstaged changes" +fi + +# This is a rough translation of: +# +# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX +if git cat-file -e HEAD 2>/dev/null +then + head=HEAD +else + head=$(git hash-object -t tree --stdin &2 + exit 1 +} + +unset GIT_DIR GIT_WORK_TREE +cd "$worktree" && + +if grep -q "^diff --git " "$1" +then + validate_patch "$1" +else + validate_cover_letter "$1" +fi && + +if test "$GIT_SENDEMAIL_FILE_COUNTER" = "$GIT_SENDEMAIL_FILE_TOTAL" +then + git config --unset-all sendemail.validateWorktree && + trap 'git worktree remove -ff "$worktree"' EXIT && + validate_series +fi diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/update.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/update.sample new file mode 100755 index 00000000..c4d426bc --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to block unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --type=bool hooks.allowunannotated) +allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) +denycreatebranch=$(git config --type=bool hooks.denycreatebranch) +allowdeletetag=$(git config --type=bool hooks.allowdeletetag) +allowmodifytag=$(git config --type=bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero=$(git hash-object --stdin &2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/index b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/index new file mode 100644 index 0000000000000000000000000000000000000000..cc47fea64fe76f4629a51a4e31a41d4b62088dfc GIT binary patch literal 324 zcmZ?q402{*U|<5_H0v`SR)y9-(~NxP%BbaCVPs$s5{Z{cV_;}p!oa}z4X8#0h)a4m zB^}*0d)nniS#jFJ_QHZwp8OPL;L=OaEXhpI%P&d=ssV#En`?7rUhaDZqao&rm;lXt zi)5ZheoCIV>9 zSwAtkBr`uxuQ&r@Pe_ofE0C4KV5DHk6)k*FH)q$nsaKD)n1)VLI{DP_=2GlNF&F}s zUq7qWUgwn=aBa!7J(n--i`sT7T?J?bP|kqMRBj2Y@YY$Sx(-+QuRi@_V3pfvRjXj! WS8==g+ru+mb24YRX-;A1&j0{oNpju* literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/info/exclude b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/info/exclude new file mode 100644 index 00000000..a5196d1b --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/HEAD b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/HEAD new file mode 100644 index 00000000..8c80fe6d --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/HEAD @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 0d0095113b5be7f4fcdfc972268318ec902c5f13 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715194973 -0400 commit (initial): initial commit +0d0095113b5be7f4fcdfc972268318ec902c5f13 c7c3fa38fd33170e7fbb15541066ebe746ba1ad6 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715202289 -0400 commit: moving action.sh +c7c3fa38fd33170e7fbb15541066ebe746ba1ad6 18c66e805702c81fc2099cb09d2490f099581f34 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715260171 -0400 commit: changing permissions +18c66e805702c81fc2099cb09d2490f099581f34 193a7a691db1f7529bbd1d7f7f4947209622486c Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715263189 -0400 commit: updating action diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/refs/heads/main b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/refs/heads/main new file mode 100644 index 00000000..8c80fe6d --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/refs/heads/main @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 0d0095113b5be7f4fcdfc972268318ec902c5f13 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715194973 -0400 commit (initial): initial commit +0d0095113b5be7f4fcdfc972268318ec902c5f13 c7c3fa38fd33170e7fbb15541066ebe746ba1ad6 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715202289 -0400 commit: moving action.sh +c7c3fa38fd33170e7fbb15541066ebe746ba1ad6 18c66e805702c81fc2099cb09d2490f099581f34 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715260171 -0400 commit: changing permissions +18c66e805702c81fc2099cb09d2490f099581f34 193a7a691db1f7529bbd1d7f7f4947209622486c Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715263189 -0400 commit: updating action diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/0d/0095113b5be7f4fcdfc972268318ec902c5f13 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/0d/0095113b5be7f4fcdfc972268318ec902c5f13 new file mode 100644 index 00000000..e9aefade --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/0d/0095113b5be7f4fcdfc972268318ec902c5f13 @@ -0,0 +1,2 @@ +xK +0aYŝ%I ".$Fڦ)u N?8?K H9t!%;;ܶ=3!e~pֲ1W{])2#a M +@W'(s,я7K] \ No newline at end of file diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/0d/65649266e723e7033103f9b6ae757ec6580057 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/0d/65649266e723e7033103f9b6ae757ec6580057 new file mode 100644 index 00000000..8a1aad43 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/0d/65649266e723e7033103f9b6ae757ec6580057 @@ -0,0 +1,2 @@ +x=M ]s +F{GcGFJCi#]||38D76S0VZqNFhF!jI.m a$Wgy>ݾs8&cmiesL~y69Vuz$'.8'$6 \ No newline at end of file diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/0f/5f2470dfcc0e605318d3559a527b90d3200f4d b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/0f/5f2470dfcc0e605318d3559a527b90d3200f4d new file mode 100644 index 0000000000000000000000000000000000000000..759614722194f39092d82c8a7eed4f178180d987 GIT binary patch literal 46 zcmb9XD~D{FgG<-NK7ut%+J#+&S04M!sF&L`HQnE7`RWaaq<9XD~D{FgG<-NK7ut%+J#+&S1z-$@4b-wyODUZozgh-hl5J MGF#6A08Y{o9Yq%x5C8xG literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/5b/13c12d6cbaae95d5c70435559222c9e531d9a5 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/5b/13c12d6cbaae95d5c70435559222c9e531d9a5 new file mode 100644 index 0000000000000000000000000000000000000000..6ca3717696202d440cf769526bd1d242127c1431 GIT binary patch literal 104 zcmV-u0GI!G0V^p=O;xZkXD~D{Ff%bx&`ZxO$xP47FG^+T-IR26*X(JR7iGn13)>3| zPI>ZE)WiS?6pD%~^OAKF^GfoI5_OAG(^894^O92;uAkLvuk*?bxVB{4p39f^MQuBk Kt^xph+$MEXaxkp` literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/64/cdce59318eb9c6b81014c4fe0339ab48bbbbc2 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/64/cdce59318eb9c6b81014c4fe0339ab48bbbbc2 new file mode 100644 index 0000000000000000000000000000000000000000..3725022898df8fc16413cc5cfd16bed59b3fa7e8 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;xZkXD~D{Ff%bx&`ZxO$xP47FG^+T-IR26*X(JR7iGn13)>3| zPI>ZE)WiS?6pD%~^OAKF^GfoI5_OAG(^894^O92;_~TUy?w{dH2$r}UIxDDp!es@1 JUjS8MBLDl2EwBIp literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/6f/646e4b35f6aa83ed6d70b74a0d50f7681cb5cd b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/6f/646e4b35f6aa83ed6d70b74a0d50f7681cb5cd new file mode 100644 index 0000000000000000000000000000000000000000..674584ce718813e1501dcfbc89bd4d06b323ade2 GIT binary patch literal 73 zcmV-P0Ji^l0ZYosPf{>9Vo+ApPs+^GPf9G#;NnV6&d66#3a-pcPEAor$xkj;f(WT2 f38^dCDd?Bv7U-u|q$Zb^q^87!6mkIodQ4#FT5gk5tA_D1q3f0`I$Jc2g>`igC&G?X@Sdx;BolP{BRrr1Ea zk%#0a^o4rk#bCvG=!M`0&yrS#EnxN?nlp6ysP(X^tHjFy6Qg0W*D8 zJJW~#l$Nimlbw>s+}PxP?7pp-S2m}N%e%5Lme=N3)7{z`t~w0>7kUB-KuD}~Z|yP7 K|CKNL={Jv#Wlb>v literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/88/9850e6e4256269c906a85b252073b9b71deb1d b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/88/9850e6e4256269c906a85b252073b9b71deb1d new file mode 100644 index 0000000000000000000000000000000000000000..2cbe1476f027915a38c67e9c37aa349e13f1164e GIT binary patch literal 88 zcmV-e0H^AWiT`_Ff%bx&`ZxO$xP47FG^+T-IR26*X(JR7iGn13)>3| uPI>ZE6sjsQxg;|`Pp>$GVd4vqo6F=c&Z=PGKDoxpS7@qweg**6gdYPoLnZJ4 literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/8d/b262c5ba9b96d3a26a5e2b133f131194e4f915 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/8d/b262c5ba9b96d3a26a5e2b133f131194e4f915 new file mode 100644 index 0000000000000000000000000000000000000000..107086caa8602a68435c07be3b99ca1bfe6ebf83 GIT binary patch literal 115 zcmV-(0F3{50UeAn4#F@DMVWmHq;4J@b?E`P2y%ldK_RhhBh;m5C$PN#q%Xa-_Vql^ z%Lxyd5O4w-L%FiMay)?4`crZMxkQw>}J8f^CyXaP<;0zH$==r1GjissY_O VN4Nc-L-LP8%Dwr!egQQICwL=lGtdA4 literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/91/e848d9a61fd19a78000bc9ac424d1295276f68 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/91/e848d9a61fd19a78000bc9ac424d1295276f68 new file mode 100644 index 0000000000000000000000000000000000000000..9c0c2bde60b868af294dfbaae92cd804ed956056 GIT binary patch literal 48 zcmV-00MGw;0ZYosPf{>8Vo+ApPs+^GPf9G#;NnV6&d66#3a-pcPEAor$xkj;;sOBf G)C=w%hZb4@ literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/a3/ffcc384822decb6bc5599bb29a74bbf22dc45e b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/a3/ffcc384822decb6bc5599bb29a74bbf22dc45e new file mode 100644 index 00000000..103db39a --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/a3/ffcc384822decb6bc5599bb29a74bbf22dc45e @@ -0,0 +1,2 @@ +x=A D]s +FAc<7(Hk- m~]y =Lt4]T} J{GͰΉ<2 iOj;kF'2z_=Ï]%ELUE?c tFeA:+(=H"6[ \ No newline at end of file diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/ae/f837338280bc8fe836d413402a84ec43a712fe b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/ae/f837338280bc8fe836d413402a84ec43a712fe new file mode 100644 index 0000000000000000000000000000000000000000..1835319bf8bd859f1354a5c9954093b72783f8ef GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;xZkXD~D{Ff%bx&`ZxO$xP47FG^+T-IR26*X(JR7iGn13)>3| zPI>ZE)WiS?6pD%~^OAKF^GfoI5_OAG(^894^O92;wwr~qGFl3#DJB>Ps`1RYZZA{R J0RT7@Aim+0EF}N{ literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/b7/3656050139102621603351260c98d73f1c7288 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/b7/3656050139102621603351260c98d73f1c7288 new file mode 100644 index 0000000000000000000000000000000000000000..380f2bc7e19fe8ad45f0db1151ce540fc195c8d7 GIT binary patch literal 45 zcmV+|0Mh?>0V^p=O;s>9U@$QN0)^tDWCp{DUK4aYA5EIz{^YvYtER%390z*<>_iRW DZq^cn literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/bb/4e47ec1aa0b5a2dec0ede431ed10577f98c7ef b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/bb/4e47ec1aa0b5a2dec0ede431ed10577f98c7ef new file mode 100644 index 0000000000000000000000000000000000000000..47f16e0c8509e51c7029cc6de6c85d3e4fad999f GIT binary patch literal 54 zcmV-60LlM&0V^p=O;s>9XD~D{Ff%bxNK7ut%+J#+&S04M!sF&L`HQnE7`RWaaq<i2SaNX`2YX_ literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/c1/eb48842df92c8f185796de35a43f789363eeab b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/c1/eb48842df92c8f185796de35a43f789363eeab new file mode 100644 index 0000000000000000000000000000000000000000..ea5fefecc7db3f9cec8675d65307a663ec094fa5 GIT binary patch literal 157 zcmV;O0Al}m0X>dE4#FT5L|tVX8 zY}6r`(b>eI1JHz688WW%%G=Ic-AGxVD?B@^L0a-yv6L6bZJ4GZu~Zy82oP9*bMGR5 zXsJJbjvG?en`*Fh@!ieGf1cjNb(aX0LG@w_tGB1 L{9pM1t8h09q&!Q) literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/c7/c3fa38fd33170e7fbb15541066ebe746ba1ad6 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/c7/c3fa38fd33170e7fbb15541066ebe746ba1ad6 new file mode 100644 index 00000000..bfb37c55 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/c7/c3fa38fd33170e7fbb15541066ebe746ba1ad6 @@ -0,0 +1 @@ +xQN q9żacG05[Pj ~>۶v)<&ce 1Y1[lR:&$Sa"#]Fţ/=?]:s;+KۇRܮH !Qz^1 Dk-þ_Z \ No newline at end of file diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/d7/cd2a877e4a6950d6a496bcd3d2be5ab6ca6724 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/d7/cd2a877e4a6950d6a496bcd3d2be5ab6ca6724 new file mode 100644 index 0000000000000000000000000000000000000000..7c084fbbd7adc19cb20c8bd9ef260b531f6c3461 GIT binary patch literal 45 zcmbY78*=~G`>#XQ~r>q~!QXx@BLhTD0(oB()@ B5<~z1 literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/refs/heads/main b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/refs/heads/main new file mode 100644 index 00000000..df82ef82 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/refs/heads/main @@ -0,0 +1 @@ +193a7a691db1f7529bbd1d7f7f4947209622486c diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/refs/tags/v0.0.16 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/refs/tags/v0.0.16 new file mode 100644 index 00000000..07f2e5a1 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/refs/tags/v0.0.16 @@ -0,0 +1 @@ +0d65649266e723e7033103f9b6ae757ec6580057 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/rsync-antora-reference/src/action.sh b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/rsync-antora-reference/src/action.sh new file mode 100755 index 00000000..6f646e4b --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/rsync-antora-reference/src/action.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +echo "Synced docs" +echo 'Synced docs' > /tmp/executed_docs diff --git a/releaser-core/src/main/java/releaser/internal/Releaser.java b/releaser-core/src/main/java/releaser/internal/Releaser.java index fe8ba8a7..336adc9d 100644 --- a/releaser-core/src/main/java/releaser/internal/Releaser.java +++ b/releaser-core/src/main/java/releaser/internal/Releaser.java @@ -90,6 +90,15 @@ public class Releaser { return this.projectGitHandler.cloneProjectFromOrg(projectName); } + public ExecutionResult buildAntoraDocs(File project) { + String currentBranch = projectGitHandler.currentBranch(project); + projectGitHandler.cloneAndCheckoutDocsBuild(project); + this.projectCommandExecutor.runAntora(this.releaserProperties, originalVersion(project), + new ProjectVersion(project), project.getAbsolutePath()); + projectGitHandler.checkout(project, currentBranch); + return ExecutionResult.success(); + } + public Projects retrieveVersionsFromBom() { return this.projectPomUpdater.retrieveVersionsFromReleaseTrainBom(); } @@ -122,6 +131,12 @@ public class Releaser { return ExecutionResult.success(); } + public ExecutionResult runAntoraBuild(ReleaserProperties properties, ProjectVersion originalVersion, + ProjectVersion versionFromBom) { + this.projectCommandExecutor.runAntora(properties, originalVersion, versionFromBom, properties.getWorkingDir()); + return ExecutionResult.success(); + } + public ExecutionResult commitAndPushTags(File project, ProjectVersion changedVersion) { this.projectGitHandler.commitAndTagIfApplicable(project, changedVersion); log.info("\nCommit was made and tag was pushed successfully"); @@ -135,9 +150,9 @@ public class Releaser { return ExecutionResult.success(); } - public ExecutionResult publishDocs(ReleaserProperties properties, ProjectVersion originalVersion, - ProjectVersion changedVersion) { - this.projectCommandExecutor.publishDocs(properties, originalVersion, changedVersion); + public ExecutionResult publishDocs(ReleaserProperties properties, File project) { + File springDocsActionsProject = this.projectGitHandler.cloneAndCheckoutSpringDocsActions(); + this.projectCommandExecutor.publishAntoraDocs(springDocsActionsProject, project, properties); log.info("\nThe docs were published successfully"); return ExecutionResult.success(); } diff --git a/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java b/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java index 5176229f..e129ad27 100644 --- a/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java +++ b/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java @@ -78,6 +78,8 @@ public class ReleaserProperties implements Serializable { private Versions versions = new Versions(); + private Antora antora = new Antora(); + private boolean commercial = false; /** @@ -208,12 +210,21 @@ public class ReleaserProperties implements Serializable { this.commercial = commercial; } + public Antora getAntora() { + return antora; + } + + public void setAntora(Antora antora) { + this.antora = antora; + } + @Override public String toString() { return "ReleaserProperties{" + "workingDir='" + this.workingDir + '\'' + ", git=" + this.git + ", pom=" + this.pom + ", maven=" + this.maven + ", gradle=" + this.gradle + ", sagan=" + this.sagan + ", fixedVersions=" + this.fixedVersions + ", metaRelease=" + this.metaRelease + ", template=" - + this.template + ", versions=" + this.versions + ", commercial=" + this.commercial + '}'; + + this.template + ", versions=" + this.versions + ", commercial=" + this.commercial + ", antora=" + + this.antora + '}'; } public ReleaserProperties copy() { @@ -436,6 +447,58 @@ public class ReleaserProperties implements Serializable { } + public static class Antora implements Serializable { + + /** + * URL to Spring Docs Actions repo. + */ + private String springDocsActionsUrl; + + /** + * Command to sync Antora docs. + */ + private String syncAntoraDocsCommand; + + /** + * Tag for Spring Docs Actions repo. + */ + private String springDocsActionsTag; + + public String getSpringDocsActionsUrl() { + return springDocsActionsUrl; + } + + public void setSpringDocsActionsUrl(String springDocsActionsUrl) { + this.springDocsActionsUrl = springDocsActionsUrl; + } + + public String getSpringDocsActionsTag() { + return springDocsActionsTag; + } + + public void setSpringDocsActionsTag(String springDocsActionsTag) { + this.springDocsActionsTag = springDocsActionsTag; + } + + public String getSyncAntoraDocsCommand() { + return syncAntoraDocsCommand; + } + + public void setSyncAntoraDocsCommand(String syncAntoraDocsCommand) { + this.syncAntoraDocsCommand = syncAntoraDocsCommand; + } + + @Override + public String toString() { + return new StringJoiner(", ", Antora.class.getSimpleName() + "[", "]") + .add("springDocsActionsUrl='" + springDocsActionsUrl + "'") + .add("syncAntoraDocsCommand='" + syncAntoraDocsCommand + "'") + .add("springDocsActionsTag='" + springDocsActionsTag + "'").toString(); + + } + + } + public static class Git implements Serializable { /** @@ -1021,6 +1084,8 @@ public class ReleaserProperties implements Serializable { private String generateReleaseTrainDocsCommand = "bash release_train.sh " + "--retrieveversions --version {{version}} --ghpages --auto"; + private String runAntoraCommand = "./mvnw antora {{systemProps}}"; + /** * Additional system properties that should be passed to the build / deploy * commands. If present in other commands "{{systemProps}}" will be substituted @@ -1101,12 +1166,20 @@ public class ReleaserProperties implements Serializable { this.systemProperties = systemProperties; } + public String getRunAntoraCommand() { + return runAntoraCommand; + } + + public void setRunAntoraCommand(String runAntoraCommand) { + this.runAntoraCommand = runAntoraCommand; + } + @Override public String toString() { return "Maven{" + "buildCommand='" + this.buildCommand + '\'' + ", deployCommand='" + this.deployCommand + '\'' + ", publishDocsCommand=" + this.publishDocsCommand + "generateReleaseTrainDocsCommand='" - + this.generateReleaseTrainDocsCommand + '\'' + ", waitTimeInMinutes=" + this.waitTimeInMinutes - + '}'; + + this.generateReleaseTrainDocsCommand + '\'' + ", runAntoraCommand= " + + runAntoraCommand + ", waitTimeInMinutes=" + this.waitTimeInMinutes + '}'; } } diff --git a/releaser-core/src/main/java/releaser/internal/git/GitRepo.java b/releaser-core/src/main/java/releaser/internal/git/GitRepo.java index 49096bf2..44c52580 100644 --- a/releaser-core/src/main/java/releaser/internal/git/GitRepo.java +++ b/releaser-core/src/main/java/releaser/internal/git/GitRepo.java @@ -184,6 +184,21 @@ class GitRepo { } } + void checkoutTag(String tagName) { + try (Git git = this.gitFactory.open(file(this.basedir))) { + Optional tagId = findTagIdByName(tagName, true); + if (tagId.isPresent()) { + git.checkout().setName(tagId.get().getName()).call(); + } + else { + throw new IllegalStateException("Tag with name [" + tagName + "] not found"); + } + } + catch (Exception e) { + throw new IllegalStateException(e); + } + } + /** * Attempt to retrieve a tag id from a name, prepending the name with /refs/tags/. */ diff --git a/releaser-core/src/main/java/releaser/internal/git/ProjectGitHandler.java b/releaser-core/src/main/java/releaser/internal/git/ProjectGitHandler.java index fcdf3eb8..431893cb 100644 --- a/releaser-core/src/main/java/releaser/internal/git/ProjectGitHandler.java +++ b/releaser-core/src/main/java/releaser/internal/git/ProjectGitHandler.java @@ -130,6 +130,16 @@ public class ProjectGitHandler implements Closeable { this.properties.getGit().getSpringProjectBranch()); } + public void cloneAndCheckoutDocsBuild(File project) { + checkout(project, "docs-build"); + } + + public File cloneAndCheckoutSpringDocsActions() { + File project = cloneProject(this.properties.getAntora().getSpringDocsActionsUrl()); + checkoutTag(project, this.properties.getAntora().getSpringDocsActionsTag()); + return project; + } + private File cloneAndCheckOut(String springProjectUrl, String springProjectUrlBranch) { File clonedProject = cloneProject(springProjectUrl); checkout(clonedProject, springProjectUrlBranch); @@ -146,12 +156,7 @@ public class ProjectGitHandler implements Closeable { * @return location of the cloned project */ public File cloneProjectFromOrg(String projectName) { - String orgUrl = this.properties.getMetaRelease().getGitOrgUrl(); - String fullUrl = orgUrl.endsWith("/") ? (orgUrl + projectName) - : (orgUrl + "/" + addCommercialSuffix(projectName) + suffixNonHttpRepo(orgUrl)); - if (log.isDebugEnabled()) { - log.debug("Full url of the project is [{}]", fullUrl); - } + String fullUrl = createRepoUrlFromProject(projectName); File clonedProject = cloneProject(fullUrl); if (log.isDebugEnabled()) { log.debug("Successfully cloned the project to [{}]", clonedProject); @@ -192,6 +197,16 @@ public class ProjectGitHandler implements Closeable { return findAndCheckOutBranchForVersion(clonedProject, versions); } + private String createRepoUrlFromProject(String projectName) { + String orgUrl = this.properties.getMetaRelease().getGitOrgUrl(); + String fullUrl = orgUrl.endsWith("/") ? (orgUrl + projectName) + : (orgUrl + "/" + addCommercialSuffix(projectName) + suffixNonHttpRepo(orgUrl)); + if (log.isDebugEnabled()) { + log.debug("Full url of the project is [{}]", fullUrl); + } + return fullUrl; + } + private File findAndCheckOutBranchForVersion(File clonedProject, String[] versions) { if (log.isDebugEnabled()) { log.debug("Checking versions {} for project [{}]", versions, clonedProject); @@ -271,6 +286,11 @@ public class ProjectGitHandler implements Closeable { return new File(destinationFolder, projectUrl.getHumanishName()); } + public void checkoutTag(File project, String tag) { + log.info("checkout tag: " + tag); + gitRepo(project).checkoutTag(tag); + } + public void checkout(File project, String branch) { log.info("checkout project: " + project + " with branch: " + branch); gitRepo(project).checkout(branch); 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 050600d5..456f7be6 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -96,6 +96,19 @@ public class ProjectCommandExecutor { } } + public void runAntora(ReleaserProperties properties, ProjectVersion originalVersion, + ProjectVersion versionFromReleaseTrain, String projectRoot) { + try { + String command = new CommandPicker(properties, projectRoot).runAntoraCommand(versionFromReleaseTrain); + String[] commands = replaceAllPlaceHolders(originalVersion, versionFromReleaseTrain, command).split(" "); + runCommand(properties, projectRoot, commands); + } + catch (Exception e) { + String message = properties + "\n" + originalVersion + "\n" + versionFromReleaseTrain + "\n" + projectRoot; + throw new IllegalStateException(message, e); + } + } + public void generateReleaseTrainDocs(ReleaserProperties properties, String version, String projectRoot) { try { String updatedCommand = new CommandPicker(properties, projectRoot) @@ -166,6 +179,12 @@ public class ProjectCommandExecutor { return new ReleaserProcessExecutor(workDir); } + 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); + runCommand(properties, antoraDocsProject.getAbsolutePath(), command.split(" ")); + } + public void publishDocs(ReleaserProperties properties, ProjectVersion originalVersion, ProjectVersion changedVersion) { try { @@ -307,6 +326,21 @@ class CommandPicker { return bashCommandWithSystemProps(releaserProperties.getBash().getBuildCommand()); } + String runAntoraCommand(ProjectVersion version) { + // TODO handle gradle and bash? + return mavenCommandWithSystemProps(releaserProperties.getMaven().getRunAntoraCommand(), version); + } + + String publishAntoraDocsCommand(File project, ReleaserProperties properties) { + ProjectVersion version = new ProjectVersion(project); + 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 \"" + + project.getAbsolutePath() + "/target/antora/site\" --github-repository \"" + repo + + "\" --dry-run {{systemProps}}"); + } + String version() { // makes more sense to use PomReader if (projectType == ProjectType.GRADLE) { diff --git a/releaser-spring/src/main/java/releaser/internal/tasks/release/PublishDocsReleaseTask.java b/releaser-spring/src/main/java/releaser/internal/tasks/release/PublishDocsReleaseTask.java index 76e8b872..17d7a9c8 100644 --- a/releaser-spring/src/main/java/releaser/internal/tasks/release/PublishDocsReleaseTask.java +++ b/releaser-spring/src/main/java/releaser/internal/tasks/release/PublishDocsReleaseTask.java @@ -56,7 +56,10 @@ public class PublishDocsReleaseTask implements ReleaseReleaserTask { @Override public ExecutionResult runTask(Arguments args) { - return this.releaser.publishDocs(args.properties, args.originalVersion, args.versionFromBom); + if (this.releaser.buildAntoraDocs(args.project).isSuccess()) { + return this.releaser.publishDocs(args.properties, args.project); + } + return ExecutionResult.failure(new RuntimeException("Failed to build Antora docs")); } @Override diff --git a/releaser-test/src/main/java/releaser/internal/buildsystem/TestUtils.java b/releaser-test/src/main/java/releaser/internal/buildsystem/TestUtils.java index e1a66c5f..ca2b3007 100644 --- a/releaser-test/src/main/java/releaser/internal/buildsystem/TestUtils.java +++ b/releaser-test/src/main/java/releaser/internal/buildsystem/TestUtils.java @@ -35,6 +35,7 @@ public final class TestUtils { prepareLocalRepo("target/test-classes/projects/", "spring-cloud-consul"); prepareLocalRepo("target/test-classes/projects/", "spring-cloud-build"); prepareLocalRepo("target/test-classes/projects/", "spring-cloud-static-angel"); + prepareLocalRepo("target/test-classes/projects/", "spring-docs-actions"); } private static void prepareLocalRepo(String buildDir, String repoPath) throws IOException { diff --git a/releaser-test/src/main/java/releaser/internal/spring/ArgsBuilder.java b/releaser-test/src/main/java/releaser/internal/spring/ArgsBuilder.java index 2ed756dd..78c46f7d 100644 --- a/releaser-test/src/main/java/releaser/internal/spring/ArgsBuilder.java +++ b/releaser-test/src/main/java/releaser/internal/spring/ArgsBuilder.java @@ -39,6 +39,8 @@ public class ArgsBuilder { private final File tempDirAllTestSample; + private File tempDirSpringDocsActions; + List args = new LinkedList<>(); public ArgsBuilder(File project, File tempDirTestSamplesProject, File tempDirReleaseTrainDocs, @@ -58,11 +60,13 @@ public class ArgsBuilder { "releaser.git.documentation-url=" + file("/projects/spring-cloud-static-angel/").toURI(), "releaser.git.test-samples-project-url=" + tempDirTestSamplesProject.getAbsolutePath(), "releaser.git.release-train-docs-url=" + tempDirReleaseTrainDocs.getAbsolutePath(), + "releaser.antora.spring-docs-actions-url=" + file("/projects/spring-docs-actions").toURI(), "releaser.maven.build-command=echo build", "releaser.maven.deploy-command=echo deploy", "releaser.maven.deploy-guides-command=echo guides", "releaser.maven.publish-docs-command=echo docs", "releaser.maven.generate-release-train-docs-command=echo releaseTrainDocs", + "releaser.maven.run-antora-command=echo antora", "releaser.working-dir=" + project.getPath(), "releaser.git.spring-project-url=" + tempDirSpringCloud.getAbsolutePath(), "releaser.git.release-train-wiki-url=" + tmpGitRepo(tempDirReleaseTrainWiki).getAbsolutePath() + "/", From 1a346a6d9004d9eae2765fca48c29983b1db3937 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Thu, 9 May 2024 16:08:47 -0400 Subject: [PATCH 02/33] Fix command split --- .../src/main/java/releaser/internal/git/GitRepo.java | 2 +- .../internal/project/ProjectCommandExecutor.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/releaser-core/src/main/java/releaser/internal/git/GitRepo.java b/releaser-core/src/main/java/releaser/internal/git/GitRepo.java index 44c52580..12b24a49 100644 --- a/releaser-core/src/main/java/releaser/internal/git/GitRepo.java +++ b/releaser-core/src/main/java/releaser/internal/git/GitRepo.java @@ -186,7 +186,7 @@ class GitRepo { void checkoutTag(String tagName) { try (Git git = this.gitFactory.open(file(this.basedir))) { - Optional tagId = findTagIdByName(tagName, true); + Optional tagId = findTagIdByName(tagName, false); if (tagId.isPresent()) { git.checkout().setName(tagId.get().getName()).call(); } 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 456f7be6..8a89931d 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -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}}"); } From 085c51e0ebebb85ab5fdb1b3500bbdb02d793ca2 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Fri, 10 May 2024 10:52:25 -0400 Subject: [PATCH 03/33] Removing system properties from action command --- .../java/releaser/internal/project/ProjectCommandExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8a89931d..814ef99a 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -345,7 +345,7 @@ class CommandPicker { return bashCommandWithSystemProps("./rsync-antora-reference/src/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 {{systemProps}}"); + + "\" --dry-run"); } String version() { From 897bbb1853c9240fde4c36d96026ea960aa590e5 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Fri, 10 May 2024 11:15:30 -0400 Subject: [PATCH 04/33] Don't add system properties substitution --- .../releaser/internal/project/ProjectCommandExecutor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 814ef99a..06cce382 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -342,10 +342,10 @@ class CommandPicker { ProjectVersion version = new ProjectVersion(project); String repo = properties.getGit().getOrgName() + "/" + version.projectName; // TODO this needs to be a property - return bashCommandWithSystemProps("./rsync-antora-reference/src/action.sh" + return "./rsync-antora-reference/src/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"); + + "\" --dry-run"; } String version() { From 94ce21331193864df16cfede1168dfde8189d995 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Fri, 10 May 2024 11:22:50 -0400 Subject: [PATCH 05/33] Run command from within src directory --- projects/spring-cloud/src/main/resources/application.yml | 2 +- .../main/java/releaser/internal/ReleaserProperties.java | 4 ++-- .../internal/project/ProjectCommandExecutor.java | 9 ++++----- 3 files changed, 7 insertions(+), 8 deletions(-) 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() { From 356cf737e1d0f35dda7e338739713a54252baafd Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Tue, 14 May 2024 15:59:13 -0400 Subject: [PATCH 06/33] Testing jenkins script --- .../src/main/resources/application.yml | 2 +- .../spring-docs-actions/git/COMMIT_EDITMSG | 2 +- .../projects/spring-docs-actions/git/index | Bin 324 -> 532 bytes .../projects/spring-docs-actions/git/logs/HEAD | 4 ++++ .../git/logs/refs/heads/main | 4 ++++ .../05/9bda736a5d7cefefb199b1187e59994f6f1221 | Bin 0 -> 45 bytes .../1e/b18ca73855f77578aff52066a75f6c5f1d76ec | Bin 0 -> 84 bytes .../24/7f4c32079f79802fc3611dac5ca68cc2fb8d13 | Bin 0 -> 104 bytes .../3c/1914e048ad43880aecf0ce0ad4d3a5220df39b | 3 +++ .../56/b2a3e3988df09963b2f925a7fb7500a9d1a928 | Bin 0 -> 45 bytes .../5c/ea1b50ae2b904ba0a339819031d68ce056373c | Bin 0 -> 46 bytes .../68/0da9cd210b268fcc51b3218f87043632388372 | Bin 0 -> 103 bytes .../76/ba2479a8e84ab5431193251c8804efb4736575 | 2 ++ .../92/9b5624034011c42b540d07ccf223eaf01d58d1 | Bin 0 -> 154 bytes .../97/3afdcd31cd449a534c3efd9aafac0c7294a7af | Bin 0 -> 88 bytes .../98/58d6e0d948d69e62cca0e393dfb21cfb4d7781 | Bin 0 -> 186 bytes .../a5/332698ebc3973b90d50577222f7530ddb7606f | Bin 0 -> 156 bytes .../ae/f9cb234b65b9d6692e7deaffb2d005e2679ef5 | Bin 0 -> 103 bytes .../b4/60e89cc9afdb4ecc7c1c3e4e0e1dae0cac7e63 | Bin 0 -> 187 bytes .../b5/c7bdf7bd1acccb578fb7f2767c3a97836f248a | 2 ++ .../ba/9d397eb47402a7e9d00a6e529285341a35168b | Bin 0 -> 184 bytes .../d3/7f03eb2442af68e831e756a9b539c3c69efa28 | Bin 0 -> 45 bytes .../e0/54f6a8bc5c3983e5fba7c129e4b1101d263b6c | Bin 0 -> 125 bytes .../e1/8658db1d6f29783e25686c6dec3f723592a30c | Bin 0 -> 46 bytes .../f1/08c2be2ede722c2c1e0f4b8298c4ae82d6c889 | Bin 0 -> 129 bytes .../f2/27240eb9453922a873c5f1817e26de54bd1180 | 3 +++ .../f2/50c03491a1c322ce1b51e4ea2298711735ceeb | Bin 0 -> 112 bytes .../f7/eeae9068b3845a5f48ea04d11f169b2b8a7994 | Bin 0 -> 104 bytes .../f8/41901875c78a360d73fd6e1fc1dc1c77c9a993 | Bin 0 -> 121 bytes .../spring-docs-actions/git/refs/heads/main | 2 +- .../spring-docs-actions/git/refs/tags/v0.0.16 | 2 +- .../rsync-antora-reference/src/action.sh | 8 ++++++++ .../rsync-antora-reference/src/jenkins.sh | 9 +++++++++ .../rsync-antora-reference/src/setup_ssh.sh | 3 +++ .../internal/git/ProjectGitHandler.java | 3 ++- .../project/ProjectCommandExecutor.java | 2 +- 36 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/05/9bda736a5d7cefefb199b1187e59994f6f1221 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/1e/b18ca73855f77578aff52066a75f6c5f1d76ec create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/24/7f4c32079f79802fc3611dac5ca68cc2fb8d13 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/3c/1914e048ad43880aecf0ce0ad4d3a5220df39b create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/56/b2a3e3988df09963b2f925a7fb7500a9d1a928 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/5c/ea1b50ae2b904ba0a339819031d68ce056373c create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/68/0da9cd210b268fcc51b3218f87043632388372 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/76/ba2479a8e84ab5431193251c8804efb4736575 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/92/9b5624034011c42b540d07ccf223eaf01d58d1 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/97/3afdcd31cd449a534c3efd9aafac0c7294a7af create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/98/58d6e0d948d69e62cca0e393dfb21cfb4d7781 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/a5/332698ebc3973b90d50577222f7530ddb7606f create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/ae/f9cb234b65b9d6692e7deaffb2d005e2679ef5 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/b4/60e89cc9afdb4ecc7c1c3e4e0e1dae0cac7e63 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/b5/c7bdf7bd1acccb578fb7f2767c3a97836f248a create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/ba/9d397eb47402a7e9d00a6e529285341a35168b create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/d3/7f03eb2442af68e831e756a9b539c3c69efa28 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/e0/54f6a8bc5c3983e5fba7c129e4b1101d263b6c create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/e1/8658db1d6f29783e25686c6dec3f723592a30c create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/f1/08c2be2ede722c2c1e0f4b8298c4ae82d6c889 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/f2/27240eb9453922a873c5f1817e26de54bd1180 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/f2/50c03491a1c322ce1b51e4ea2298711735ceeb create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/f7/eeae9068b3845a5f48ea04d11f169b2b8a7994 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/f8/41901875c78a360d73fd6e1fc1dc1c77c9a993 create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/rsync-antora-reference/src/jenkins.sh create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/rsync-antora-reference/src/setup_ssh.sh diff --git a/projects/spring-cloud/src/main/resources/application.yml b/projects/spring-cloud/src/main/resources/application.yml index 41bef052..c90bb283 100644 --- a/projects/spring-cloud/src/main/resources/application.yml +++ b/projects/spring-cloud/src/main/resources/application.yml @@ -102,7 +102,7 @@ releaser: bom-name: spring-cloud # fixed-versions: antora: - spring-docs-actions-url: https://github.com/spring-io/spring-doc-actions + spring-docs-actions-url: https://github.com/ryanjbaxter/spring-doc-actions spring-docs-actions-tag: v0.0.16 sync-antora-docs-command: "./action.sh" meta-release: diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/COMMIT_EDITMSG b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/COMMIT_EDITMSG index 0406423b..263d6d50 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/COMMIT_EDITMSG +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/COMMIT_EDITMSG @@ -1 +1 @@ -updating action +making jenkins.sh executable diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/index b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/index index cc47fea64fe76f4629a51a4e31a41d4b62088dfc..ea4dc90c6821f0fbdb85b48e6b98dcaba9ab94d1 100644 GIT binary patch literal 532 zcmZ?q402{*U|<4bmNZ+oI!?pvM=+X^fk8+l|BVj=L*o(#2F7ndH6lP<(z_|?=&sq* zE-%W8(-yWD7M$|rrziuLUV3IpW_n(JQ7TXk7^K;yYsvmi(SgxW^JW0edy8aV^QV9V zCKDGPRyrpg_~ez+j6!kKbFUdxii#`ql64dFO7e>mb&FEdQj1dal2i4Ii<0#dlS?x5 z^Yn@{p!PU#?lqZkt~Ski(^BE*0!P61Op?EYX3yM@9EbMl-7C`3k>mGnnsH=Z)3pf| z46pS(2s5`~P{(6WacW6vL40v>2E?Y2AXitQ&r%pn6b!jk>V1sZ=T|o9A5N5A6SJ)6 z(C=Ph>_#yd1C?K{XMU~Xv_9j7;q$PSTP+VCoA*lt7-T>>1Fj#A6C_HHcbV}P|IL#> hct@uE3!N1HNa-Y&|=1hE9D*kgF?D zK83+Z!H_Fj_@Hjiu60wd9%nHPouqW~so~9~Ma7kQ$-0SoCHX~(x<#pJsYR)I$*By6 zK;_rZYPHvSWd>YZGHuW0OZ%d>ok~|JE=mT<8E~1(EnyYjI;&LI;VS>tr+*Bra{H`m Z6^#2TZdZSMc&2Mk<_tH@DeU}=833}{Sdjn# diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/HEAD b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/HEAD index 8c80fe6d..676d9b6f 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/HEAD +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/HEAD @@ -2,3 +2,7 @@ 0d0095113b5be7f4fcdfc972268318ec902c5f13 c7c3fa38fd33170e7fbb15541066ebe746ba1ad6 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715202289 -0400 commit: moving action.sh c7c3fa38fd33170e7fbb15541066ebe746ba1ad6 18c66e805702c81fc2099cb09d2490f099581f34 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715260171 -0400 commit: changing permissions 18c66e805702c81fc2099cb09d2490f099581f34 193a7a691db1f7529bbd1d7f7f4947209622486c Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715263189 -0400 commit: updating action +193a7a691db1f7529bbd1d7f7f4947209622486c b460e89cc9afdb4ecc7c1c3e4e0e1dae0cac7e63 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715364505 -0400 commit: adding setup_ssh.sh +b460e89cc9afdb4ecc7c1c3e4e0e1dae0cac7e63 9858d6e0d948d69e62cca0e393dfb21cfb4d7781 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715712689 -0400 commit: adding jenkins.sh +9858d6e0d948d69e62cca0e393dfb21cfb4d7781 ba9d397eb47402a7e9d00a6e529285341a35168b Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715712751 -0400 commit: removed runme +ba9d397eb47402a7e9d00a6e529285341a35168b 3c1914e048ad43880aecf0ce0ad4d3a5220df39b Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715712928 -0400 commit: making jenkins.sh executable diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/refs/heads/main b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/refs/heads/main index 8c80fe6d..676d9b6f 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/refs/heads/main +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/refs/heads/main @@ -2,3 +2,7 @@ 0d0095113b5be7f4fcdfc972268318ec902c5f13 c7c3fa38fd33170e7fbb15541066ebe746ba1ad6 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715202289 -0400 commit: moving action.sh c7c3fa38fd33170e7fbb15541066ebe746ba1ad6 18c66e805702c81fc2099cb09d2490f099581f34 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715260171 -0400 commit: changing permissions 18c66e805702c81fc2099cb09d2490f099581f34 193a7a691db1f7529bbd1d7f7f4947209622486c Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715263189 -0400 commit: updating action +193a7a691db1f7529bbd1d7f7f4947209622486c b460e89cc9afdb4ecc7c1c3e4e0e1dae0cac7e63 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715364505 -0400 commit: adding setup_ssh.sh +b460e89cc9afdb4ecc7c1c3e4e0e1dae0cac7e63 9858d6e0d948d69e62cca0e393dfb21cfb4d7781 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715712689 -0400 commit: adding jenkins.sh +9858d6e0d948d69e62cca0e393dfb21cfb4d7781 ba9d397eb47402a7e9d00a6e529285341a35168b Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715712751 -0400 commit: removed runme +ba9d397eb47402a7e9d00a6e529285341a35168b 3c1914e048ad43880aecf0ce0ad4d3a5220df39b Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715712928 -0400 commit: making jenkins.sh executable diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/05/9bda736a5d7cefefb199b1187e59994f6f1221 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/05/9bda736a5d7cefefb199b1187e59994f6f1221 new file mode 100644 index 0000000000000000000000000000000000000000..5af0320e7416ce74f11d53e43db6a582602c4d69 GIT binary patch literal 45 zcmV+|0Mh?>0V^p=O;s>9U@$QN0)^tDWQIwz!&I0Z1dnKk@Uoxzr2OiGY{W$X)|3q6 DgxVA} literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/1e/b18ca73855f77578aff52066a75f6c5f1d76ec b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/1e/b18ca73855f77578aff52066a75f6c5f1d76ec new file mode 100644 index 0000000000000000000000000000000000000000..b358630ca0c5ccca5615bc274985f5fa9524d637 GIT binary patch literal 84 zcmV-a0IUCa0ZYosPg1ZjV^CJqPs+^GPf9G#;NmJyEh#OCFD}l|1MyOmGx8Obf-Ccq qQ&SXD@{@~|AVTU$Lh1^33i>6v1^THKsmY}!sVVUwg3| zPI>ZE)WiS?6pD%~^OAKF^GfoI5_OAG(^894^O92;F4r@^R&iRN@xt(V*vhSzhmXzs Kr2znN(Ix&zqcMa4 literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/3c/1914e048ad43880aecf0ce0ad4d3a5220df39b b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/3c/1914e048ad43880aecf0ce0ad4d3a5220df39b new file mode 100644 index 00000000..6bf84e23 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/3c/1914e048ad43880aecf0ce0ad4d3a5220df39b @@ -0,0 +1,3 @@ +xAn 9Z07i#uz-~=^enɼ*آi )j Ğ88T4ȔdF + ΐYަ +Ѥ‡Gޝag_&uZ~{vM{x]>ye];աWj\*ح&(D?^[ \ No newline at end of file diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/56/b2a3e3988df09963b2f925a7fb7500a9d1a928 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/56/b2a3e3988df09963b2f925a7fb7500a9d1a928 new file mode 100644 index 0000000000000000000000000000000000000000..68a0233c036c3c74dedbee28ec42e1a1e3a72b87 GIT binary patch literal 45 zcmbxw@v9f%6Q%831!i B5qJOq literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/5c/ea1b50ae2b904ba0a339819031d68ce056373c b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/5c/ea1b50ae2b904ba0a339819031d68ce056373c new file mode 100644 index 0000000000000000000000000000000000000000..cbd9030cbe65f982b28597b9822cad1b70242de1 GIT binary patch literal 46 zcmb3| zPI>ZE)WiS?6pD%~^OAKF^GfoI5_OAG(^894^O92;9=1i?md)3!uv5**$$evAWIAav J4*+3VBZ&zGE(`zw literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/76/ba2479a8e84ab5431193251c8804efb4736575 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/76/ba2479a8e84ab5431193251c8804efb4736575 new file mode 100644 index 00000000..6b33500e --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/76/ba2479a8e84ab5431193251c8804efb4736575 @@ -0,0 +1,2 @@ +x=M ]s +FGcG@_k- ^tdfܓ|V"6C4` 5JAֱ>LӘX*;@߳;SQ c]*iye19Q.4T )0W>d7 \ No newline at end of file diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/92/9b5624034011c42b540d07ccf223eaf01d58d1 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/92/9b5624034011c42b540d07ccf223eaf01d58d1 new file mode 100644 index 0000000000000000000000000000000000000000..74ec604c0ea0cf580523eb2796e6370d08718a47 GIT binary patch literal 154 zcmV;L0A>Gp0V^p=O;s>7HDoX}FfcbYRY*)O$;{8wE6!l}6mY;~;=;p9=cEIlyi%G` zC~kW0HBgb6iHSm1YF>6`UNK13M~*}L^zIeu=*aPVH_bS*uIbu|PN=G)(!AVMuu1AF zd^=q&l~xoV{n%Kib}wYFU<1^;;?$DTg81U%43N5*SJDCNv?q8kSZvui!SGtogD`U& I0OJWh4CNAXD~D{FgG<-NK7ut%+J#+&R~$+*t6Us^m}Q=`mYLU%j0w6 uWy{_`6&0tJlorGn7iWOf#k`UZSf@R~d%!z&1s#3fn*4lFl^^uo(d4T$);RmzPP?W*dp~xxeW+W*{p&GYmOdY8;B9@A oI%pTP@l%v9$|@yJJ=cFj{}>gN^HMMJih5h>KJ2sj0lNZRdE4uUWcMP2t4-5Z-JOp7GO7?0o$+F?YDP*Mu9x3{`*_w(}e{!gx# zy1`xWPo^Y2THs?#)Vh1;k%=18R5LQL?i>R-YS`8y<(VagaU7CJ#j$|`rR_KO9OW&$ zNnYJMm3%T4RtER6u&4jA%ert})D$AmudMnZJyx%Z?p)4jQ(H6@$O9mN5M!2GX%Aug KuY3TXVK}l0HcLkU literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/ae/f9cb234b65b9d6692e7deaffb2d005e2679ef5 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/ae/f9cb234b65b9d6692e7deaffb2d005e2679ef5 new file mode 100644 index 0000000000000000000000000000000000000000..d3d1c264967e9ce7d8dc7cc582c294cbbe08ead9 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;xZkXD~D{Ff%bx&`ZxO$xP47FG^+T-IR26*X(JR7iGn13)>3| zPI>ZE)WiS?6pD%~^OAKF^GfoI5_OAG(^894^O92;SZCiV&Wf#h|9<1ljS_W{GyU_0 J6ajCUB#jQ literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/b4/60e89cc9afdb4ecc7c1c3e4e0e1dae0cac7e63 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/b4/60e89cc9afdb4ecc7c1c3e4e0e1dae0cac7e63 new file mode 100644 index 0000000000000000000000000000000000000000..e2f1d1fd05bc5da5f14c729fbc9fe2939d4eba3c GIT binary patch literal 187 zcmV;s07U6 \ No newline at end of file diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/ba/9d397eb47402a7e9d00a6e529285341a35168b b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/ba/9d397eb47402a7e9d00a6e529285341a35168b new file mode 100644 index 0000000000000000000000000000000000000000..7bde056899ad640efcffe252c1db0bc0fa468f6f GIT binary patch literal 184 zcmV;p07w6L0j~0sL_C5ws3a91r0LTMRm2oV(R^E5=i-)Ylt^gUVhv$JR&KFVRA`OjYW8_R9khVb=rUp~(BwCAOa m{-Pm(3t)o-{bbM>b?9;ZH}sEDCEUjsS1tS2S^WT^eOaOSO0V^p=O;s>9U@$QN0)^tDWQHG(6C_HHcbV}P|IL#>ct@uE7G-WU}FfcbYRY*)O$;{8wE6!l}6mY;~;=;p9=cEIlyi%G` zC~kW0HBgb6iHSm1YF>6`UNK13M~*}L^zIeu=*aPVH_bS*uIbu|PN-4EsU@Wa@x{d% fAayaXqyyGzPw-x_*s^hg;kBLzVdgdfL`yJp;Ho>y literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/e1/8658db1d6f29783e25686c6dec3f723592a30c b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/e1/8658db1d6f29783e25686c6dec3f723592a30c new file mode 100644 index 0000000000000000000000000000000000000000..98bd7c61d751489fac5ff342b6a1610cd8509e65 GIT binary patch literal 46 zcmb6HD^#()KALH(@#n)&fwxwR&Y-(Q7FksRY)!^DoV{OQAo)w zN=+`wFRJ8%io^p&Y*jQ0%2PB!>K#*3u&Y-n$p=dWIEHvAlqD8rCMM;ia-~)jooZ,M뻺z5Ə<N RNNkhWZGd@5LG.N=l^m_$ "VfRZjoJmNGaj%tLz#N!B㺲8I)CߍeyTeYz3+e '?)s{y~;'$=G\5!Vdv/'45co%! @Ⱦ##nP!;D* \ No newline at end of file diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/f2/50c03491a1c322ce1b51e4ea2298711735ceeb b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/f2/50c03491a1c322ce1b51e4ea2298711735ceeb new file mode 100644 index 0000000000000000000000000000000000000000..1808386d8c654cf797b587c7a23f3451d155a4bb GIT binary patch literal 112 zcmV-$0FVE80ZYosPf{>6He^s%)KALH(@#n)&fqFeEm6=-g-~f+AiA_5zPLC;4=Bf# znw*iZpcGu0mzESElEv@2Pp*Vt;j5iPtH$C SwN3| zPI>ZE)WiS?6pD%~^OAKF^GfoI5_OAG(^894^O92;!Zs~_Jfru+%;Zf!RhR!RWmtJ} Kr3L_mekR;3ST4%| literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/f8/41901875c78a360d73fd6e1fc1dc1c77c9a993 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/f8/41901875c78a360d73fd6e1fc1dc1c77c9a993 new file mode 100644 index 0000000000000000000000000000000000000000..d9286f36d71b2e9e20e41c2e9d0630b98aa5ec7d GIT binary patch literal 121 zcmV-<0EYi~0V^p=O;s>7G-WU}FfcbYRY*)O$;{8wE6!l}6mY;~;=;p9=cEIlyi%G` zC~kW0HB?bnYF>6`UNK13M~*}L^zIeu=*aPVH_bS*uIbu|PN=Hl)RNMI_~POWkh+*x b(gEwVCwMPdY}q)$@LJD /tmp/executed_docs + +exit_code=$? + +exit $exit_code diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/rsync-antora-reference/src/jenkins.sh b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/rsync-antora-reference/src/jenkins.sh new file mode 100755 index 00000000..f108c2be --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/rsync-antora-reference/src/jenkins.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +# Get the current directory +current_dir=$(pwd) + +# Add the current directory to the PATH variable +export PATH=$PATH:$current_dir + +action.sh "$@" diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/rsync-antora-reference/src/setup_ssh.sh b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/rsync-antora-reference/src/setup_ssh.sh new file mode 100755 index 00000000..5cea1b50 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/rsync-antora-reference/src/setup_ssh.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +echo "Setup ssh" diff --git a/releaser-core/src/main/java/releaser/internal/git/ProjectGitHandler.java b/releaser-core/src/main/java/releaser/internal/git/ProjectGitHandler.java index 431893cb..5f87cd6a 100644 --- a/releaser-core/src/main/java/releaser/internal/git/ProjectGitHandler.java +++ b/releaser-core/src/main/java/releaser/internal/git/ProjectGitHandler.java @@ -136,7 +136,8 @@ public class ProjectGitHandler implements Closeable { public File cloneAndCheckoutSpringDocsActions() { File project = cloneProject(this.properties.getAntora().getSpringDocsActionsUrl()); - checkoutTag(project, this.properties.getAntora().getSpringDocsActionsTag()); + // TODO for testing + // checkoutTag(project, this.properties.getAntora().getSpringDocsActionsTag()); return project; } 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 daae1fe5..d9fe1f11 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -342,7 +342,7 @@ class CommandPicker { ProjectVersion version = new ProjectVersion(project); String repo = properties.getGit().getOrgName() + "/" + version.projectName; // TODO this needs to be a property - return "./action.sh" + return "./jenkins.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"; } From 1b44ffad2352a70fb87e08cebea4fcd1ba60a029 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Tue, 14 May 2024 16:13:42 -0400 Subject: [PATCH 07/33] Fixing command run --- .../java/releaser/internal/project/ProjectCommandExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d9fe1f11..5e20ff68 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -189,7 +189,7 @@ public class ProjectCommandExecutor { commands[i] = commands[i].replace("{{cat-key}}", "\"$(cat $DOCS_SERVER_SSH_KEY)\""); } } - runCommand(properties, antoraDocsProject.getAbsolutePath() + "/rsync-antora-reference/src", command.split(" ")); + runCommand(properties, antoraDocsProject.getAbsolutePath() + "/rsync-antora-reference/src", commands); } public void publishDocs(ReleaserProperties properties, ProjectVersion originalVersion, From 7502904d4ffcf7007e9b86af69780842c122137b Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Tue, 14 May 2024 16:25:57 -0400 Subject: [PATCH 08/33] updating hostname --- .../java/releaser/internal/project/ProjectCommandExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5e20ff68..a3ddbe95 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -343,7 +343,7 @@ class CommandPicker { String repo = properties.getGit().getOrgName() + "/" + version.projectName; // TODO this needs to be a property return "./jenkins.sh" - + " --docs-username \"$DOCS_SERVER_SSH_USER\" --docs-host \"docs.spring.io\" --docs-ssh-key {{cat-key}} --docs-ssh-host-key \"#\" --site-path \"" + + " --docs-username \"$DOCS_SERVER_SSH_USER\" --docs-host \"docs-ip.spring.io\" --docs-ssh-key {{cat-key}} --docs-ssh-host-key \"#\" --site-path \"" + project.getAbsolutePath() + "/target/antora/site\" --github-repository \"" + repo + "\" --dry-run"; } From fcef1508f929a63da21eaae8fd5720eaaadfdd5a Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Wed, 15 May 2024 09:07:56 -0400 Subject: [PATCH 09/33] Removing quotes around hostname --- .../java/releaser/internal/project/ProjectCommandExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a3ddbe95..11b8b1fd 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -343,7 +343,7 @@ class CommandPicker { String repo = properties.getGit().getOrgName() + "/" + version.projectName; // TODO this needs to be a property return "./jenkins.sh" - + " --docs-username \"$DOCS_SERVER_SSH_USER\" --docs-host \"docs-ip.spring.io\" --docs-ssh-key {{cat-key}} --docs-ssh-host-key \"#\" --site-path \"" + + " --docs-username \"$DOCS_SERVER_SSH_USER\" --docs-host docs-ip.spring.io --docs-ssh-key {{cat-key}} --docs-ssh-host-key \"#\" --site-path \"" + project.getAbsolutePath() + "/target/antora/site\" --github-repository \"" + repo + "\" --dry-run"; } From ab83d508e6ec20687e781f106319f69d0aa3bde6 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Wed, 15 May 2024 09:57:17 -0400 Subject: [PATCH 10/33] Removing quotes --- .../java/releaser/internal/project/ProjectCommandExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 11b8b1fd..49d7845d 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -343,7 +343,7 @@ class CommandPicker { String repo = properties.getGit().getOrgName() + "/" + version.projectName; // TODO this needs to be a property return "./jenkins.sh" - + " --docs-username \"$DOCS_SERVER_SSH_USER\" --docs-host docs-ip.spring.io --docs-ssh-key {{cat-key}} --docs-ssh-host-key \"#\" --site-path \"" + + " --docs-username $DOCS_SERVER_SSH_USER --docs-host docs-ip.spring.io --docs-ssh-key {{cat-key}} --docs-ssh-host-key # --site-path \"" + project.getAbsolutePath() + "/target/antora/site\" --github-repository \"" + repo + "\" --dry-run"; } From c3cfffa645e21e074fb781bcc8b5b0ab5f51f12c Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Wed, 15 May 2024 10:12:32 -0400 Subject: [PATCH 11/33] Fixing username --- .../java/releaser/internal/project/ProjectCommandExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 49d7845d..28aca224 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -343,7 +343,7 @@ class CommandPicker { String repo = properties.getGit().getOrgName() + "/" + version.projectName; // TODO this needs to be a property return "./jenkins.sh" - + " --docs-username $DOCS_SERVER_SSH_USER --docs-host docs-ip.spring.io --docs-ssh-key {{cat-key}} --docs-ssh-host-key # --site-path \"" + + " --docs-username DOCS_SERVER_SSH_USER --docs-host docs-ip.spring.io --docs-ssh-key {{cat-key}} --docs-ssh-host-key # --site-path \"" + project.getAbsolutePath() + "/target/antora/site\" --github-repository \"" + repo + "\" --dry-run"; } From 653b3aa64418a56b92247b22cb3762adbe1c1ea3 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Wed, 15 May 2024 10:51:54 -0400 Subject: [PATCH 12/33] Fixing username --- .../java/releaser/internal/project/ProjectCommandExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 28aca224..30948e71 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -343,7 +343,7 @@ class CommandPicker { String repo = properties.getGit().getOrgName() + "/" + version.projectName; // TODO this needs to be a property return "./jenkins.sh" - + " --docs-username DOCS_SERVER_SSH_USER --docs-host docs-ip.spring.io --docs-ssh-key {{cat-key}} --docs-ssh-host-key # --site-path \"" + + " --docs-username ${DOCS_SERVER_SSH_USER} --docs-host docs-ip.spring.io --docs-ssh-key {{cat-key}} --docs-ssh-host-key # --site-path \"" + project.getAbsolutePath() + "/target/antora/site\" --github-repository \"" + repo + "\" --dry-run"; } From 0b262e871ce24f2a85a9763b222acd6683f1e776 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Wed, 15 May 2024 11:04:03 -0400 Subject: [PATCH 13/33] Fix username --- .../java/releaser/internal/project/ProjectCommandExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 30948e71..0a2c51ff 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -343,7 +343,7 @@ class CommandPicker { String repo = properties.getGit().getOrgName() + "/" + version.projectName; // TODO this needs to be a property return "./jenkins.sh" - + " --docs-username ${DOCS_SERVER_SSH_USER} --docs-host docs-ip.spring.io --docs-ssh-key {{cat-key}} --docs-ssh-host-key # --site-path \"" + + " --docs-username \"${DOCS_SERVER_SSH_USER}\" --docs-host docs-ip.spring.io --docs-ssh-key {{cat-key}} --docs-ssh-host-key # --site-path \"" + project.getAbsolutePath() + "/target/antora/site\" --github-repository \"" + repo + "\" --dry-run"; } From 3ae56ede5659711ccae6ab7dbbc888cf71e09d9e Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Wed, 15 May 2024 12:02:32 -0400 Subject: [PATCH 14/33] Removing quotes --- .../releaser/internal/project/ProjectCommandExecutor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 0a2c51ff..18c21bc1 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -343,8 +343,8 @@ class CommandPicker { String repo = properties.getGit().getOrgName() + "/" + version.projectName; // TODO this needs to be a property return "./jenkins.sh" - + " --docs-username \"${DOCS_SERVER_SSH_USER}\" --docs-host docs-ip.spring.io --docs-ssh-key {{cat-key}} --docs-ssh-host-key # --site-path \"" - + project.getAbsolutePath() + "/target/antora/site\" --github-repository \"" + repo + "\" --dry-run"; + + " --docs-username ${DOCS_SERVER_SSH_USER} --docs-host docs-ip.spring.io --docs-ssh-key {{cat-key}} --docs-ssh-host-key # --site-path \"" + + project.getAbsolutePath() + "/target/antora/site\" --github-repository " + repo + " --dry-run"; } String version() { From d95cdfbb03f2c16bbee59bb77b8fd0872560a692 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Wed, 15 May 2024 16:57:00 -0400 Subject: [PATCH 15/33] Update ProjectCommandExecutor.java --- .../java/releaser/internal/project/ProjectCommandExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 18c21bc1..50184c33 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -343,7 +343,7 @@ class CommandPicker { String repo = properties.getGit().getOrgName() + "/" + version.projectName; // TODO this needs to be a property return "./jenkins.sh" - + " --docs-username ${DOCS_SERVER_SSH_USER} --docs-host docs-ip.spring.io --docs-ssh-key {{cat-key}} --docs-ssh-host-key # --site-path \"" + + " --docs-host docs-ip.spring.io --docs-ssh-host-key # --site-path \"" + project.getAbsolutePath() + "/target/antora/site\" --github-repository " + repo + " --dry-run"; } From c7fd6350ffae6aa7760f2fb92024a1ba1e1c7852 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Wed, 15 May 2024 17:10:51 -0400 Subject: [PATCH 16/33] Removing quotes --- .../releaser/internal/project/ProjectCommandExecutor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 50184c33..f02aee35 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -343,8 +343,8 @@ class CommandPicker { String repo = properties.getGit().getOrgName() + "/" + version.projectName; // TODO this needs to be a property return "./jenkins.sh" - + " --docs-host docs-ip.spring.io --docs-ssh-host-key # --site-path \"" - + project.getAbsolutePath() + "/target/antora/site\" --github-repository " + repo + " --dry-run"; + + " --docs-host docs-ip.spring.io --docs-ssh-host-key # --site-path " + + project.getAbsolutePath() + "/target/antora/site --github-repository " + repo + " --dry-run"; } String version() { From 829354ee3aa0cd0717cf4c9c3fde3ad4be6948c0 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Fri, 17 May 2024 17:02:19 -0400 Subject: [PATCH 17/33] Adding properties for username, sshkey, and host --- .../releaser/internal/ReleaserProperties.java | 46 ++++++++++++++++--- 1 file changed, 39 insertions(+), 7 deletions(-) diff --git a/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java b/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java index 771a456f..b3e90aa1 100644 --- a/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java +++ b/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java @@ -464,6 +464,12 @@ public class ReleaserProperties implements Serializable { */ private String springDocsActionsTag; + private String springDocsSshUsername; + + private String springDocsSshKey; + + private String springDocsSshHostKey; + public String getSpringDocsActionsUrl() { return springDocsActionsUrl; } @@ -488,15 +494,41 @@ public class ReleaserProperties implements Serializable { this.syncAntoraDocsCommand = syncAntoraDocsCommand; } - @Override - public String toString() { - return new StringJoiner(", ", Antora.class.getSimpleName() + "[", "]") - .add("springDocsActionsUrl='" + springDocsActionsUrl + "'") - .add("syncAntoraDocsCommand='" + syncAntoraDocsCommand + "'") - .add("springDocsActionsTag='" + springDocsActionsTag + "'").toString(); - + public String getSpringDocsSshUsername() { + return springDocsSshUsername; } + public void setSpringDocsSshUsername(String springDocsSshUsername) { + this.springDocsSshUsername = springDocsSshUsername; + } + + public String getSpringDocsSshKey(String springDocsSshKey) { + return springDocsSshKey; + } + + public void setSpringDocsSshKey(String springDocsSshKey) { + this.springDocsSshKey = springDocsSshKey; + } + + public String getSpringDocsSshHostKey(String springDocsSshHostKey) { + return springDocsSshHostKey; + } + + public void setSpringDocsSshHostKey(String springDocsSshHostKey) { + this.springDocsSshHostKey = springDocsSshHostKey; + } + + @Override + public String toString() { + return "Antora{" + + "springDocsActionsUrl='" + springDocsActionsUrl + '\'' + + ", syncAntoraDocsCommand='" + syncAntoraDocsCommand + '\'' + + ", springDocsActionsTag='" + springDocsActionsTag + '\'' + + ", springDocsSshUsername='" + springDocsSshUsername + '\'' + + ", springDocsSshKey='" + springDocsSshKey + '\'' + + ", springDocsSshHostKey='" + springDocsSshHostKey + '\'' + + '}'; + } } public static class Git implements Serializable { From 0a3388c326020fe888f2ca3399071868f4335e92 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Fri, 17 May 2024 17:13:00 -0400 Subject: [PATCH 18/33] Update jenkins command --- .../src/main/java/releaser/internal/ReleaserProperties.java | 4 ++-- .../releaser/internal/project/ProjectCommandExecutor.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java b/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java index b3e90aa1..0f6ff787 100644 --- a/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java +++ b/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java @@ -502,7 +502,7 @@ public class ReleaserProperties implements Serializable { this.springDocsSshUsername = springDocsSshUsername; } - public String getSpringDocsSshKey(String springDocsSshKey) { + public String getSpringDocsSshKey() { return springDocsSshKey; } @@ -510,7 +510,7 @@ public class ReleaserProperties implements Serializable { this.springDocsSshKey = springDocsSshKey; } - public String getSpringDocsSshHostKey(String springDocsSshHostKey) { + public String getSpringDocsSshHostKey() { return springDocsSshHostKey; } 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 f02aee35..d5bc255f 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -342,8 +342,8 @@ class CommandPicker { ProjectVersion version = new ProjectVersion(project); String repo = properties.getGit().getOrgName() + "/" + version.projectName; // TODO this needs to be a property - return "./jenkins.sh" - + " --docs-host docs-ip.spring.io --docs-ssh-host-key # --site-path " + return "./jenkins.sh --docs-username " + properties.getAntora().getSpringDocsSshUsername() + " --docs-ssh-key " + properties.getAntora().getSpringDocsSshKey() + + " --docs-host docs-ip.spring.io --docs-ssh-host-key " + properties.getAntora().getSpringDocsSshHostKey() + " --site-path " + project.getAbsolutePath() + "/target/antora/site --github-repository " + repo + " --dry-run"; } From de5f84579a9f54e65d7422fbc50c8e56e0c66407 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Mon, 20 May 2024 09:04:36 -0400 Subject: [PATCH 19/33] Temporarily removing host key --- .../java/releaser/internal/project/ProjectCommandExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d5bc255f..be2df207 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -343,7 +343,7 @@ class CommandPicker { String repo = properties.getGit().getOrgName() + "/" + version.projectName; // TODO this needs to be a property return "./jenkins.sh --docs-username " + properties.getAntora().getSpringDocsSshUsername() + " --docs-ssh-key " + properties.getAntora().getSpringDocsSshKey() - + " --docs-host docs-ip.spring.io --docs-ssh-host-key " + properties.getAntora().getSpringDocsSshHostKey() + " --site-path " + + " --docs-host docs-ip.spring.io --docs-ssh-host-key # --site-path " + project.getAbsolutePath() + "/target/antora/site --github-repository " + repo + " --dry-run"; } From d2dcf9f87f0dee981c1dfa78a098e40297440f02 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Tue, 21 May 2024 13:53:34 -0400 Subject: [PATCH 20/33] Update variable name --- .../java/releaser/internal/ReleaserProperties.java | 12 ++++++------ .../internal/project/ProjectCommandExecutor.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java b/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java index 0f6ff787..b0abd2ae 100644 --- a/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java +++ b/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java @@ -466,7 +466,7 @@ public class ReleaserProperties implements Serializable { private String springDocsSshUsername; - private String springDocsSshKey; + private String springDocsSshKeyPath; private String springDocsSshHostKey; @@ -502,12 +502,12 @@ public class ReleaserProperties implements Serializable { this.springDocsSshUsername = springDocsSshUsername; } - public String getSpringDocsSshKey() { - return springDocsSshKey; + public String getSpringDocsSshKeyPath() { + return springDocsSshKeyPath; } - public void setSpringDocsSshKey(String springDocsSshKey) { - this.springDocsSshKey = springDocsSshKey; + public void setSpringDocsSshKeyPath(String springDocsSshKeyPath) { + this.springDocsSshKeyPath = springDocsSshKeyPath; } public String getSpringDocsSshHostKey() { @@ -525,7 +525,7 @@ public class ReleaserProperties implements Serializable { ", syncAntoraDocsCommand='" + syncAntoraDocsCommand + '\'' + ", springDocsActionsTag='" + springDocsActionsTag + '\'' + ", springDocsSshUsername='" + springDocsSshUsername + '\'' + - ", springDocsSshKey='" + springDocsSshKey + '\'' + + ", springDocsSshKey='" + springDocsSshKeyPath + '\'' + ", springDocsSshHostKey='" + springDocsSshHostKey + '\'' + '}'; } 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 be2df207..6078afba 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -342,7 +342,7 @@ class CommandPicker { ProjectVersion version = new ProjectVersion(project); String repo = properties.getGit().getOrgName() + "/" + version.projectName; // TODO this needs to be a property - return "./jenkins.sh --docs-username " + properties.getAntora().getSpringDocsSshUsername() + " --docs-ssh-key " + properties.getAntora().getSpringDocsSshKey() + return "./jenkins.sh --docs-username " + properties.getAntora().getSpringDocsSshUsername() + " --docs-ssh-key-path " + properties.getAntora().getSpringDocsSshKeyPath() + " --docs-host docs-ip.spring.io --docs-ssh-host-key # --site-path " + project.getAbsolutePath() + "/target/antora/site --github-repository " + repo + " --dry-run"; } From 620e41ae90c146a7b5cc77a6e99ade1776d7977b Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Tue, 21 May 2024 15:44:29 -0400 Subject: [PATCH 21/33] Using host key property --- .../java/releaser/internal/project/ProjectCommandExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6078afba..ad95710a 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -343,7 +343,7 @@ class CommandPicker { String repo = properties.getGit().getOrgName() + "/" + version.projectName; // TODO this needs to be a property return "./jenkins.sh --docs-username " + properties.getAntora().getSpringDocsSshUsername() + " --docs-ssh-key-path " + properties.getAntora().getSpringDocsSshKeyPath() - + " --docs-host docs-ip.spring.io --docs-ssh-host-key # --site-path " + + " --docs-host docs-ip.spring.io --docs-ssh-host-key " + properties.getAntora().getSpringDocsSshHostKey() + " --site-path " + project.getAbsolutePath() + "/target/antora/site --github-repository " + repo + " --dry-run"; } From 0e3a5af0d2f61c5a3f677c90d97ae53652ea9308 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Tue, 21 May 2024 15:52:36 -0400 Subject: [PATCH 22/33] Fixing host key --- .../releaser/internal/project/ProjectCommandExecutor.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 ad95710a..fa2522ab 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -189,6 +189,11 @@ public class ProjectCommandExecutor { commands[i] = commands[i].replace("{{cat-key}}", "\"$(cat $DOCS_SERVER_SSH_KEY)\""); } } + for (int i = 0; i < commands.length; i++) { + if (commands[i].contains("{{host-key}}")) { + commands[i] = commands[i].replace("{{host-key}}", properties.getAntora().getSpringDocsSshHostKey()); + } + } runCommand(properties, antoraDocsProject.getAbsolutePath() + "/rsync-antora-reference/src", commands); } @@ -343,7 +348,7 @@ class CommandPicker { String repo = properties.getGit().getOrgName() + "/" + version.projectName; // TODO this needs to be a property return "./jenkins.sh --docs-username " + properties.getAntora().getSpringDocsSshUsername() + " --docs-ssh-key-path " + properties.getAntora().getSpringDocsSshKeyPath() - + " --docs-host docs-ip.spring.io --docs-ssh-host-key " + properties.getAntora().getSpringDocsSshHostKey() + " --site-path " + + " --docs-host docs-ip.spring.io --docs-ssh-host-key {{host-key}} --site-path " + project.getAbsolutePath() + "/target/antora/site --github-repository " + repo + " --dry-run"; } From 09fc9e821177ecf71f99fc58fcea5eb2c7a49d47 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Tue, 21 May 2024 16:28:24 -0400 Subject: [PATCH 23/33] Quoting key --- .../java/releaser/internal/project/ProjectCommandExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fa2522ab..4c4317cc 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -191,7 +191,7 @@ public class ProjectCommandExecutor { } for (int i = 0; i < commands.length; i++) { if (commands[i].contains("{{host-key}}")) { - commands[i] = commands[i].replace("{{host-key}}", properties.getAntora().getSpringDocsSshHostKey()); + commands[i] = commands[i].replace("{{host-key}}", "\"" + properties.getAntora().getSpringDocsSshHostKey()) + "\""; } } runCommand(properties, antoraDocsProject.getAbsolutePath() + "/rsync-antora-reference/src", commands); From 87a80a314dc77236c947d1fbb541e189b47bb136 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Wed, 22 May 2024 14:49:02 -0400 Subject: [PATCH 24/33] Use command from properties --- .../src/main/resources/application.yml | 2 +- .../releaser/internal/ReleaserProperties.java | 13 +++++------- .../project/ProjectCommandExecutor.java | 21 ++++++++++--------- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/projects/spring-cloud/src/main/resources/application.yml b/projects/spring-cloud/src/main/resources/application.yml index c90bb283..8ac51437 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/ryanjbaxter/spring-doc-actions spring-docs-actions-tag: v0.0.16 - sync-antora-docs-command: "./action.sh" + sync-antora-docs-command: "./jenkins.sh --docs-username {{ssh-username}} --docs-ssh-key-path {{ssh-key-path}} --docs-host docs-ip.spring.io --docs-ssh-host-key {{host-key}} --site-path {{site-path}} --github-repository {{github-repo}}" 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 b0abd2ae..9a33fbce 100644 --- a/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java +++ b/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java @@ -520,15 +520,12 @@ public class ReleaserProperties implements Serializable { @Override public String toString() { - return "Antora{" + - "springDocsActionsUrl='" + springDocsActionsUrl + '\'' + - ", syncAntoraDocsCommand='" + syncAntoraDocsCommand + '\'' + - ", springDocsActionsTag='" + springDocsActionsTag + '\'' + - ", springDocsSshUsername='" + springDocsSshUsername + '\'' + - ", springDocsSshKey='" + springDocsSshKeyPath + '\'' + - ", springDocsSshHostKey='" + springDocsSshHostKey + '\'' + - '}'; + return "Antora{" + "springDocsActionsUrl='" + springDocsActionsUrl + '\'' + ", syncAntoraDocsCommand='" + + syncAntoraDocsCommand + '\'' + ", springDocsActionsTag='" + springDocsActionsTag + '\'' + + ", springDocsSshUsername='" + springDocsSshUsername + '\'' + ", springDocsSshKey='" + + springDocsSshKeyPath + '\'' + ", springDocsSshHostKey='" + springDocsSshHostKey + '\'' + '}'; } + } public static class Git 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 4c4317cc..40f2fbcc 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -184,14 +184,10 @@ public class ProjectCommandExecutor { 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)\""); - } - } for (int i = 0; i < commands.length; i++) { if (commands[i].contains("{{host-key}}")) { - commands[i] = commands[i].replace("{{host-key}}", "\"" + properties.getAntora().getSpringDocsSshHostKey()) + "\""; + commands[i] = commands[i].replace("{{host-key}}", + "\"" + properties.getAntora().getSpringDocsSshHostKey()) + "\""; } } runCommand(properties, antoraDocsProject.getAbsolutePath() + "/rsync-antora-reference/src", commands); @@ -346,10 +342,15 @@ class CommandPicker { String publishAntoraDocsCommand(File project, ReleaserProperties properties) { ProjectVersion version = new ProjectVersion(project); String repo = properties.getGit().getOrgName() + "/" + version.projectName; - // TODO this needs to be a property - return "./jenkins.sh --docs-username " + properties.getAntora().getSpringDocsSshUsername() + " --docs-ssh-key-path " + properties.getAntora().getSpringDocsSshKeyPath() - + " --docs-host docs-ip.spring.io --docs-ssh-host-key {{host-key}} --site-path " - + project.getAbsolutePath() + "/target/antora/site --github-repository " + repo + " --dry-run"; + String command = properties.getAntora().getSyncAntoraDocsCommand().replace("{{github-repo}}", repo) + .replace("{{site-path}}", project.getAbsolutePath() + "/target/antora/site"); + if (StringUtils.hasText(properties.getAntora().getSpringDocsSshUsername())) { + command = command.replace("{{ssh-username}}", properties.getAntora().getSpringDocsSshUsername()); + } + if (StringUtils.hasText(properties.getAntora().getSpringDocsSshKeyPath())) { + command = command.replace("{{ssh-key-path}}", properties.getAntora().getSpringDocsSshKeyPath()); + } + return command; } String version() { 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 25/33] 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); } From 2a91a11f10f0a7e22f55a1076d825472329d49e1 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Fri, 24 May 2024 09:44:56 -0400 Subject: [PATCH 26/33] Moving action runner script to this project --- .../src/main/resources/application.yml | 2 +- .../spring-docs-actions/git/COMMIT_EDITMSG | 2 +- .../projects/spring-docs-actions/git/index | Bin 532 -> 428 bytes .../spring-docs-actions/git/logs/HEAD | 1 + .../git/logs/refs/heads/main | 1 + .../01/8554f12b64fc2fb8a0ea306455c8d0da30b891 | Bin 0 -> 188 bytes .../3f/51ebc9b6a3f84f7e58ffd9097ee9b648f2d1b6 | Bin 0 -> 45 bytes .../50/6e0407dfb53853723a2f3f24a0086d53bdb05c | Bin 0 -> 88 bytes .../a8/8e84ce082bf3ebbcfe497949499e99c6cb2c10 | Bin 0 -> 104 bytes .../ae/f500da0cf73a881df5e7d7ddf0d6533d5f2610 | Bin 0 -> 155 bytes .../spring-docs-actions/git/refs/heads/main | 2 +- .../spring-docs-actions/git/refs/tags/v0.0.16 | 2 +- ...enkins.sh => spring-docs-action-runner.sh} | 0 .../releaser/internal/ReleaserProperties.java | 1 + .../internal/git/ProjectGitHandler.java | 3 +- .../project/ProjectCommandExecutor.java | 41 ++++-- .../resources/spring-docs-action-runner.sh | 122 ++++++++++++++++++ 17 files changed, 162 insertions(+), 15 deletions(-) create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/01/8554f12b64fc2fb8a0ea306455c8d0da30b891 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/3f/51ebc9b6a3f84f7e58ffd9097ee9b648f2d1b6 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/50/6e0407dfb53853723a2f3f24a0086d53bdb05c create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/a8/8e84ce082bf3ebbcfe497949499e99c6cb2c10 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/ae/f500da0cf73a881df5e7d7ddf0d6533d5f2610 rename projects/spring-cloud/src/test/resources/{projects/spring-docs-actions/rsync-antora-reference/src/jenkins.sh => spring-docs-action-runner.sh} (100%) create mode 100755 releaser-core/src/main/resources/spring-docs-action-runner.sh diff --git a/projects/spring-cloud/src/main/resources/application.yml b/projects/spring-cloud/src/main/resources/application.yml index 8ac51437..a040863f 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/ryanjbaxter/spring-doc-actions spring-docs-actions-tag: v0.0.16 - sync-antora-docs-command: "./jenkins.sh --docs-username {{ssh-username}} --docs-ssh-key-path {{ssh-key-path}} --docs-host docs-ip.spring.io --docs-ssh-host-key {{host-key}} --site-path {{site-path}} --github-repository {{github-repo}}" + sync-antora-docs-command: "./spring-docs-action-runner.sh --docs-username {{ssh-username}} --docs-ssh-key-path {{ssh-key-path}} --docs-host docs-ip.spring.io --docs-ssh-host-key {{host-key}} --site-path {{site-path}} --github-repository {{github-repo}}" meta-release: enabled: false release-train-project-name: spring-cloud-release diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/COMMIT_EDITMSG b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/COMMIT_EDITMSG index 263d6d50..d0d15f93 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/COMMIT_EDITMSG +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/COMMIT_EDITMSG @@ -1 +1 @@ -making jenkins.sh executable +removing jenkins.sh diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/index b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/index index ea4dc90c6821f0fbdb85b48e6b98dcaba9ab94d1..35a2def9a3c14d85e7c5aa9c2f2166ca0199739f 100644 GIT binary patch delta 144 zcmbQjvWA(*#WTp6fq{Vuh?yty?3}F2SWs@PV92$iujL$v_UG4o{&`kxnP`Q2J>yz6S|M0Ji_yogcSB5-$-3j^lU2JOZdT>Y&$wa#J)KDf0PgNMumAu6 delta 201 zcmV;)05<=u1C#^|L`hOZ0000200004kqo&#L$i%Ekj{N(L$ak4=McmJ000sck{{dv z0D 1715712689 -0400 commit: adding jenkins.sh 9858d6e0d948d69e62cca0e393dfb21cfb4d7781 ba9d397eb47402a7e9d00a6e529285341a35168b Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715712751 -0400 commit: removed runme ba9d397eb47402a7e9d00a6e529285341a35168b 3c1914e048ad43880aecf0ce0ad4d3a5220df39b Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715712928 -0400 commit: making jenkins.sh executable +3c1914e048ad43880aecf0ce0ad4d3a5220df39b 018554f12b64fc2fb8a0ea306455c8d0da30b891 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1716557772 -0400 commit: removing jenkins.sh diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/refs/heads/main b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/refs/heads/main index 676d9b6f..429a0398 100644 --- a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/refs/heads/main +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/refs/heads/main @@ -6,3 +6,4 @@ c7c3fa38fd33170e7fbb15541066ebe746ba1ad6 18c66e805702c81fc2099cb09d2490f099581f3 b460e89cc9afdb4ecc7c1c3e4e0e1dae0cac7e63 9858d6e0d948d69e62cca0e393dfb21cfb4d7781 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715712689 -0400 commit: adding jenkins.sh 9858d6e0d948d69e62cca0e393dfb21cfb4d7781 ba9d397eb47402a7e9d00a6e529285341a35168b Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715712751 -0400 commit: removed runme ba9d397eb47402a7e9d00a6e529285341a35168b 3c1914e048ad43880aecf0ce0ad4d3a5220df39b Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715712928 -0400 commit: making jenkins.sh executable +3c1914e048ad43880aecf0ce0ad4d3a5220df39b 018554f12b64fc2fb8a0ea306455c8d0da30b891 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1716557772 -0400 commit: removing jenkins.sh diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/01/8554f12b64fc2fb8a0ea306455c8d0da30b891 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/01/8554f12b64fc2fb8a0ea306455c8d0da30b891 new file mode 100644 index 0000000000000000000000000000000000000000..9e05b4fdbf4ce182bbeff0159580d55551163b26 GIT binary patch literal 188 zcmV;t07L(H0j-WvZo?oDMElJt_CJaR%Mw7Us;Eck4FIoWr!_<+c1S`2ttY-%H+xZ59tOo|5MONo literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/3f/51ebc9b6a3f84f7e58ffd9097ee9b648f2d1b6 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/3f/51ebc9b6a3f84f7e58ffd9097ee9b648f2d1b6 new file mode 100644 index 0000000000000000000000000000000000000000..5622effbef59dd09f8e27897cf5617074b5f46bd GIT binary patch literal 45 zcmbAXD~D{FgG<-NK7ut%+J#+&S3ZyaKL2Z!oy1EqywM4QkqdH uZhG!DR8etiNohfRad8GnUCb-#fOXmvycaCCY@A?tt>;0QxeWj_d?5rq0VLx9 literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/a8/8e84ce082bf3ebbcfe497949499e99c6cb2c10 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/a8/8e84ce082bf3ebbcfe497949499e99c6cb2c10 new file mode 100644 index 0000000000000000000000000000000000000000..49762c8a3ff9b9a69607d4fa7be1c9265fb08615 GIT binary patch literal 104 zcmV-u0GI!G0V^p=O;xZkXD~D{Ff%bx&`ZxO$xP47FG^+T-IR26*X(JR7iGn13)>3| zPI>ZE)WiS?6pD%~^OAKF^GfoI5_OAG(^894^O92;>;qq)+_w0Ke_h1?o1Aqow|RWJ KxD5b+ODBX!_%Hnc literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/ae/f500da0cf73a881df5e7d7ddf0d6533d5f2610 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/ae/f500da0cf73a881df5e7d7ddf0d6533d5f2610 new file mode 100644 index 0000000000000000000000000000000000000000..0532386f561b7e3a36e5639333d2411ed802f777 GIT binary patch literal 155 zcmV;M0A&Ao0X>dE4#FT5L|t/ as the content. The default is to use /\${REPOSITORY_NAME}/reference + from --github-repository +" +} + +__action_usage_error() { + echo "Error: $1" >&2 + __action_usage + exit 1 +} + +__action() { + local docs_username docs_host docs_ssh_key docs_ssh_host_key site_path github_repository httpdocs_path valid_args + local rsync_flag_options='' + if [ ! -z "$BUILD_REFNAME" ]; then + rsync_flag_options="${rsync_flag_options} --build-ref-name $BUILD_REFNAME" + fi + valid_args=$(getopt --options '' --long docs-username:,docs-host:,docs-ssh-key-path:,docs-ssh-host-key:,dry-run,site-path:,github-repository:,httpdocs-path: -- "$@") + if [[ $? -ne 0 ]]; then + __action_usage + exit 1; + fi + + eval set -- "$valid_args" + + while [ : ]; do + case "$1" in + --docs-username) + docs_username="$2" + shift 2 + ;; + --docs-host) + docs_host="$2" + shift 2 + ;; + --docs-ssh-key-path) + docs_ssh_key=$(cat "$2") + shift 2 + ;; + --docs-ssh-host-key) + docs_ssh_host_key="$2" + shift 2 + ;; + --dry-run) + rsync_flag_options="${rsync_flag_options} --dry-run" + shift + ;; + --site-path) + site_path="$2" + shift 2 + ;; + --github-repository) + github_repository="$2" + shift 2 + ;; + --httpdocs-path) + httpdocs_path="$2" + shift 2 + ;; + --) shift; + break + ;; + *) + __action_usage_error "Invalid argument $1 $2" + ;; + esac + done + + if [ -z "$docs_username" ]; then + __action_usage_error "Missing option '--docs-username'" + fi + if [ -z "$docs_host" ]; then + __action_usage_error "Missing option '--docs-host'" + fi + if [ -z "$docs_ssh_key" ]; then + __action_usage_error "Missing option '--docs-ssh-key'" + fi + if [ -z "$docs_ssh_host_key" ]; then + __action_usage_error "Missing option '--docs-ssh-host-key'" + fi + if [ -z "$site_path" ]; then + site_path="build/site" + fi + if [ -z "$github_repository" ]; then + __action_usage_error "Missing option '--github-repository'" + fi + + ( + set -e + set -f + + action.sh --docs-username "$docs_username" --docs-host "$docs_host" --docs-ssh-key "$docs_ssh_key" --docs-ssh-host-key "$docs_ssh_host_key" --site-path "$site_path" --github-repository "$github_repository" $rsync_flag_options + ) + exit_code=$? + + + exit $exit_code +} + +__action "$@" From 7c768758ba1d48315286197d244fd493842ab30b Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Fri, 24 May 2024 09:51:51 -0400 Subject: [PATCH 27/33] using spring-io repo --- projects/spring-cloud/src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/spring-cloud/src/main/resources/application.yml b/projects/spring-cloud/src/main/resources/application.yml index a040863f..a62ed817 100644 --- a/projects/spring-cloud/src/main/resources/application.yml +++ b/projects/spring-cloud/src/main/resources/application.yml @@ -102,7 +102,7 @@ releaser: bom-name: spring-cloud # fixed-versions: antora: - spring-docs-actions-url: https://github.com/ryanjbaxter/spring-doc-actions + spring-docs-actions-url: https://github.com/spring-io/spring-doc-actions spring-docs-actions-tag: v0.0.16 sync-antora-docs-command: "./spring-docs-action-runner.sh --docs-username {{ssh-username}} --docs-ssh-key-path {{ssh-key-path}} --docs-host docs-ip.spring.io --docs-ssh-host-key {{host-key}} --site-path {{site-path}} --github-repository {{github-repo}}" meta-release: From 583ddab1d75dc76443f6e25ff05b9c5dd80ecbc1 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Thu, 9 May 2024 13:22:54 -0400 Subject: [PATCH 28/33] Add new code to sync antora docs --- .../src/main/resources/application.yml | 4 + .../projects/spring-docs-actions/.gitignore | 16 ++ .../spring-docs-actions/git/COMMIT_EDITMSG | 1 + .../projects/spring-docs-actions/git/HEAD | 1 + .../projects/spring-docs-actions/git/config | 7 + .../spring-docs-actions/git/description | 1 + .../git/hooks/applypatch-msg.sample | 15 ++ .../git/hooks/commit-msg.sample | 24 +++ .../git/hooks/fsmonitor-watchman.sample | 174 ++++++++++++++++++ .../git/hooks/post-update.sample | 8 + .../git/hooks/pre-applypatch.sample | 14 ++ .../git/hooks/pre-commit.sample | 49 +++++ .../git/hooks/pre-merge-commit.sample | 13 ++ .../git/hooks/pre-push.sample | 53 ++++++ .../git/hooks/pre-rebase.sample | 169 +++++++++++++++++ .../git/hooks/pre-receive.sample | 24 +++ .../git/hooks/prepare-commit-msg.sample | 42 +++++ .../git/hooks/push-to-checkout.sample | 78 ++++++++ .../git/hooks/sendemail-validate.sample | 77 ++++++++ .../git/hooks/update.sample | 128 +++++++++++++ .../projects/spring-docs-actions/git/index | Bin 0 -> 428 bytes .../spring-docs-actions/git/info/exclude | 6 + .../spring-docs-actions/git/logs/HEAD | 9 + .../git/logs/refs/heads/main | 9 + .../01/8554f12b64fc2fb8a0ea306455c8d0da30b891 | Bin 0 -> 188 bytes .../05/9bda736a5d7cefefb199b1187e59994f6f1221 | Bin 0 -> 45 bytes .../0d/0095113b5be7f4fcdfc972268318ec902c5f13 | 2 + .../0d/65649266e723e7033103f9b6ae757ec6580057 | 2 + .../0f/5f2470dfcc0e605318d3559a527b90d3200f4d | Bin 0 -> 46 bytes .../18/c66e805702c81fc2099cb09d2490f099581f34 | 1 + .../19/3a7a691db1f7529bbd1d7f7f4947209622486c | 1 + .../1e/b18ca73855f77578aff52066a75f6c5f1d76ec | Bin 0 -> 84 bytes .../24/7f4c32079f79802fc3611dac5ca68cc2fb8d13 | Bin 0 -> 104 bytes .../31/914a902c49e2929047e4d716ea82715c6c403f | Bin 0 -> 54 bytes .../35/1ea40513b59a752d40d50fd5e5fc303a6d8e3a | Bin 0 -> 54 bytes .../3c/1914e048ad43880aecf0ce0ad4d3a5220df39b | 3 + .../3f/51ebc9b6a3f84f7e58ffd9097ee9b648f2d1b6 | Bin 0 -> 45 bytes .../50/6e0407dfb53853723a2f3f24a0086d53bdb05c | Bin 0 -> 88 bytes .../56/b2a3e3988df09963b2f925a7fb7500a9d1a928 | Bin 0 -> 45 bytes .../5b/13c12d6cbaae95d5c70435559222c9e531d9a5 | Bin 0 -> 104 bytes .../5c/ea1b50ae2b904ba0a339819031d68ce056373c | Bin 0 -> 46 bytes .../64/cdce59318eb9c6b81014c4fe0339ab48bbbbc2 | Bin 0 -> 103 bytes .../68/0da9cd210b268fcc51b3218f87043632388372 | Bin 0 -> 103 bytes .../6f/646e4b35f6aa83ed6d70b74a0d50f7681cb5cd | Bin 0 -> 73 bytes .../75/5f221a5212015576ede283e6a0f3ce477c238f | Bin 0 -> 156 bytes .../76/ba2479a8e84ab5431193251c8804efb4736575 | 2 + .../88/9850e6e4256269c906a85b252073b9b71deb1d | Bin 0 -> 88 bytes .../8d/b262c5ba9b96d3a26a5e2b133f131194e4f915 | Bin 0 -> 115 bytes .../91/e848d9a61fd19a78000bc9ac424d1295276f68 | Bin 0 -> 48 bytes .../92/9b5624034011c42b540d07ccf223eaf01d58d1 | Bin 0 -> 154 bytes .../97/3afdcd31cd449a534c3efd9aafac0c7294a7af | Bin 0 -> 88 bytes .../98/58d6e0d948d69e62cca0e393dfb21cfb4d7781 | Bin 0 -> 186 bytes .../a3/ffcc384822decb6bc5599bb29a74bbf22dc45e | 2 + .../a5/332698ebc3973b90d50577222f7530ddb7606f | Bin 0 -> 156 bytes .../a8/8e84ce082bf3ebbcfe497949499e99c6cb2c10 | Bin 0 -> 104 bytes .../ae/f500da0cf73a881df5e7d7ddf0d6533d5f2610 | Bin 0 -> 155 bytes .../ae/f837338280bc8fe836d413402a84ec43a712fe | Bin 0 -> 103 bytes .../ae/f9cb234b65b9d6692e7deaffb2d005e2679ef5 | Bin 0 -> 103 bytes .../b4/60e89cc9afdb4ecc7c1c3e4e0e1dae0cac7e63 | Bin 0 -> 187 bytes .../b5/c7bdf7bd1acccb578fb7f2767c3a97836f248a | 2 + .../b7/3656050139102621603351260c98d73f1c7288 | Bin 0 -> 45 bytes .../ba/9d397eb47402a7e9d00a6e529285341a35168b | Bin 0 -> 184 bytes .../bb/4e47ec1aa0b5a2dec0ede431ed10577f98c7ef | Bin 0 -> 54 bytes .../c1/eb48842df92c8f185796de35a43f789363eeab | Bin 0 -> 157 bytes .../c7/c3fa38fd33170e7fbb15541066ebe746ba1ad6 | 1 + .../d3/7f03eb2442af68e831e756a9b539c3c69efa28 | Bin 0 -> 45 bytes .../d7/cd2a877e4a6950d6a496bcd3d2be5ab6ca6724 | Bin 0 -> 45 bytes .../e0/54f6a8bc5c3983e5fba7c129e4b1101d263b6c | Bin 0 -> 125 bytes .../e1/8658db1d6f29783e25686c6dec3f723592a30c | Bin 0 -> 46 bytes .../f1/08c2be2ede722c2c1e0f4b8298c4ae82d6c889 | Bin 0 -> 129 bytes .../f2/27240eb9453922a873c5f1817e26de54bd1180 | 3 + .../f2/50c03491a1c322ce1b51e4ea2298711735ceeb | Bin 0 -> 112 bytes .../f7/eeae9068b3845a5f48ea04d11f169b2b8a7994 | Bin 0 -> 104 bytes .../f8/41901875c78a360d73fd6e1fc1dc1c77c9a993 | Bin 0 -> 121 bytes .../spring-docs-actions/git/refs/heads/main | 1 + .../spring-docs-actions/git/refs/tags/v0.0.16 | 1 + .../rsync-antora-reference/src/action.sh | 12 ++ .../rsync-antora-reference/src/setup_ssh.sh | 3 + .../resources/spring-docs-action-runner.sh | 9 + .../main/java/releaser/internal/Releaser.java | 21 ++- .../releaser/internal/ReleaserProperties.java | 125 ++++++++++++- .../java/releaser/internal/git/GitRepo.java | 15 ++ .../internal/git/ProjectGitHandler.java | 32 +++- .../project/ProjectCommandExecutor.java | 71 +++++++ .../resources/spring-docs-action-runner.sh | 122 ++++++++++++ .../tasks/release/PublishDocsReleaseTask.java | 5 +- .../internal/buildsystem/TestUtils.java | 1 + .../releaser/internal/spring/ArgsBuilder.java | 4 + 88 files changed, 1350 insertions(+), 13 deletions(-) create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/.gitignore create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/COMMIT_EDITMSG create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/HEAD create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/config create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/description create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/applypatch-msg.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/commit-msg.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/fsmonitor-watchman.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/post-update.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-applypatch.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-commit.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-merge-commit.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-push.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-rebase.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-receive.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/prepare-commit-msg.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/push-to-checkout.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/sendemail-validate.sample create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/update.sample create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/index create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/info/exclude create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/HEAD create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/refs/heads/main create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/01/8554f12b64fc2fb8a0ea306455c8d0da30b891 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/05/9bda736a5d7cefefb199b1187e59994f6f1221 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/0d/0095113b5be7f4fcdfc972268318ec902c5f13 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/0d/65649266e723e7033103f9b6ae757ec6580057 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/0f/5f2470dfcc0e605318d3559a527b90d3200f4d create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/18/c66e805702c81fc2099cb09d2490f099581f34 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/19/3a7a691db1f7529bbd1d7f7f4947209622486c create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/1e/b18ca73855f77578aff52066a75f6c5f1d76ec create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/24/7f4c32079f79802fc3611dac5ca68cc2fb8d13 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/31/914a902c49e2929047e4d716ea82715c6c403f create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/35/1ea40513b59a752d40d50fd5e5fc303a6d8e3a create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/3c/1914e048ad43880aecf0ce0ad4d3a5220df39b create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/3f/51ebc9b6a3f84f7e58ffd9097ee9b648f2d1b6 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/50/6e0407dfb53853723a2f3f24a0086d53bdb05c create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/56/b2a3e3988df09963b2f925a7fb7500a9d1a928 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/5b/13c12d6cbaae95d5c70435559222c9e531d9a5 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/5c/ea1b50ae2b904ba0a339819031d68ce056373c create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/64/cdce59318eb9c6b81014c4fe0339ab48bbbbc2 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/68/0da9cd210b268fcc51b3218f87043632388372 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/6f/646e4b35f6aa83ed6d70b74a0d50f7681cb5cd create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/75/5f221a5212015576ede283e6a0f3ce477c238f create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/76/ba2479a8e84ab5431193251c8804efb4736575 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/88/9850e6e4256269c906a85b252073b9b71deb1d create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/8d/b262c5ba9b96d3a26a5e2b133f131194e4f915 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/91/e848d9a61fd19a78000bc9ac424d1295276f68 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/92/9b5624034011c42b540d07ccf223eaf01d58d1 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/97/3afdcd31cd449a534c3efd9aafac0c7294a7af create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/98/58d6e0d948d69e62cca0e393dfb21cfb4d7781 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/a3/ffcc384822decb6bc5599bb29a74bbf22dc45e create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/a5/332698ebc3973b90d50577222f7530ddb7606f create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/a8/8e84ce082bf3ebbcfe497949499e99c6cb2c10 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/ae/f500da0cf73a881df5e7d7ddf0d6533d5f2610 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/ae/f837338280bc8fe836d413402a84ec43a712fe create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/ae/f9cb234b65b9d6692e7deaffb2d005e2679ef5 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/b4/60e89cc9afdb4ecc7c1c3e4e0e1dae0cac7e63 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/b5/c7bdf7bd1acccb578fb7f2767c3a97836f248a create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/b7/3656050139102621603351260c98d73f1c7288 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/ba/9d397eb47402a7e9d00a6e529285341a35168b create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/bb/4e47ec1aa0b5a2dec0ede431ed10577f98c7ef create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/c1/eb48842df92c8f185796de35a43f789363eeab create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/c7/c3fa38fd33170e7fbb15541066ebe746ba1ad6 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/d3/7f03eb2442af68e831e756a9b539c3c69efa28 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/d7/cd2a877e4a6950d6a496bcd3d2be5ab6ca6724 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/e0/54f6a8bc5c3983e5fba7c129e4b1101d263b6c create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/e1/8658db1d6f29783e25686c6dec3f723592a30c create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/f1/08c2be2ede722c2c1e0f4b8298c4ae82d6c889 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/f2/27240eb9453922a873c5f1817e26de54bd1180 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/f2/50c03491a1c322ce1b51e4ea2298711735ceeb create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/f7/eeae9068b3845a5f48ea04d11f169b2b8a7994 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/f8/41901875c78a360d73fd6e1fc1dc1c77c9a993 create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/refs/heads/main create mode 100644 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/refs/tags/v0.0.16 create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/rsync-antora-reference/src/action.sh create mode 100755 projects/spring-cloud/src/test/resources/projects/spring-docs-actions/rsync-antora-reference/src/setup_ssh.sh create mode 100755 projects/spring-cloud/src/test/resources/spring-docs-action-runner.sh create mode 100755 releaser-core/src/main/resources/spring-docs-action-runner.sh diff --git a/projects/spring-cloud/src/main/resources/application.yml b/projects/spring-cloud/src/main/resources/application.yml index c840cfdd..a62ed817 100644 --- a/projects/spring-cloud/src/main/resources/application.yml +++ b/projects/spring-cloud/src/main/resources/application.yml @@ -101,6 +101,10 @@ releaser: all-versions-file-url: https://raw.githubusercontent.com/spring-io/start.spring.io/main/start-site/src/main/resources/application.yml bom-name: spring-cloud # fixed-versions: + antora: + spring-docs-actions-url: https://github.com/spring-io/spring-doc-actions + spring-docs-actions-tag: v0.0.16 + sync-antora-docs-command: "./spring-docs-action-runner.sh --docs-username {{ssh-username}} --docs-ssh-key-path {{ssh-key-path}} --docs-host docs-ip.spring.io --docs-ssh-host-key {{host-key}} --site-path {{site-path}} --github-repository {{github-repo}}" meta-release: enabled: false release-train-project-name: spring-cloud-release diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/.gitignore b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/.gitignore new file mode 100644 index 00000000..8db262c5 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/.gitignore @@ -0,0 +1,16 @@ +*~ +#* +*# +.#* +.classpath +.project +.settings/ +.springBeans +target/ +_site/ +.idea +*.iml +*.ipr +.factorypath +*.swp +/consul \ No newline at end of file diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/COMMIT_EDITMSG b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/COMMIT_EDITMSG new file mode 100644 index 00000000..d0d15f93 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/COMMIT_EDITMSG @@ -0,0 +1 @@ +removing jenkins.sh diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/HEAD b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/HEAD new file mode 100644 index 00000000..b870d826 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/main diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/config b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/config new file mode 100644 index 00000000..6c9406b7 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/config @@ -0,0 +1,7 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/description b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/description new file mode 100644 index 00000000..498b267a --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/applypatch-msg.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/applypatch-msg.sample new file mode 100755 index 00000000..a5d7b84a --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/commit-msg.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/commit-msg.sample new file mode 100755 index 00000000..b58d1184 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/fsmonitor-watchman.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/fsmonitor-watchman.sample new file mode 100755 index 00000000..23e856f5 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/fsmonitor-watchman.sample @@ -0,0 +1,174 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 2) and last update token +# formatted as a string and outputs to stdout a new update token and +# all files that have been modified since the update token. Paths must +# be relative to the root of the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $last_update_token) = @ARGV; + +# Uncomment for debugging +# print STDERR "$0 $version $last_update_token\n"; + +# Check the hook interface version +if ($version ne 2) { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree = get_working_dir(); + +my $retry = 1; + +my $json_pkg; +eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; +} or do { + require JSON::PP; + $json_pkg = "JSON::PP"; +}; + +launch_watchman(); + +sub launch_watchman { + my $o = watchman_query(); + if (is_work_tree_watched($o)) { + output_result($o->{clock}, @{$o->{files}}); + } +} + +sub output_result { + my ($clockid, @files) = @_; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # binmode $fh, ":utf8"; + # print $fh "$clockid\n@files\n"; + # close $fh; + + binmode STDOUT, ":utf8"; + print $clockid; + print "\0"; + local $, = "\0"; + print @files; +} + +sub watchman_clock { + my $response = qx/watchman clock "$git_work_tree"/; + die "Failed to get clock id on '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + return $json_pkg->new->utf8->decode($response); +} + +sub watchman_query { + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $last_update_token but not from the .git folder. + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + my $last_update_line = ""; + if (substr($last_update_token, 0, 1) eq "c") { + $last_update_token = "\"$last_update_token\""; + $last_update_line = qq[\n"since": $last_update_token,]; + } + my $query = <<" END"; + ["query", "$git_work_tree", {$last_update_line + "fields": ["name"], + "expression": ["not", ["dirname", ".git"]] + }] + END + + # Uncomment for debugging the watchman query + # open (my $fh, ">", ".git/watchman-query.json"); + # print $fh $query; + # close $fh; + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + # Uncomment for debugging the watch response + # open ($fh, ">", ".git/watchman-response.json"); + # print $fh $response; + # close $fh; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + return $json_pkg->new->utf8->decode($response); +} + +sub is_work_tree_watched { + my ($output) = @_; + my $error = $output->{error}; + if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + $retry--; + my $response = qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + $output = $json_pkg->new->utf8->decode($response); + $error = $output->{error}; + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # close $fh; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + my $o = watchman_clock(); + $error = $output->{error}; + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + output_result($o->{clock}, ("/")); + $last_update_token = $o->{clock}; + + eval { launch_watchman() }; + return 0; + } + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + return 1; +} + +sub get_working_dir { + my $working_dir; + if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $working_dir = Win32::GetCwd(); + $working_dir =~ tr/\\/\//; + } else { + require Cwd; + $working_dir = Cwd::cwd(); + } + + return $working_dir; +} diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/post-update.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/post-update.sample new file mode 100755 index 00000000..ec17ec19 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-applypatch.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-applypatch.sample new file mode 100755 index 00000000..4142082b --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-commit.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-commit.sample new file mode 100755 index 00000000..29ed5ee4 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff-index --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-merge-commit.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-merge-commit.sample new file mode 100755 index 00000000..399eab19 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-push.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-push.sample new file mode 100755 index 00000000..4ce688d3 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +zero=$(git hash-object --stdin &2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-rebase.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-rebase.sample new file mode 100755 index 00000000..6cbef5c3 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-receive.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-receive.sample new file mode 100755 index 00000000..a1fd29ec --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/prepare-commit-msg.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/prepare-commit-msg.sample new file mode 100755 index 00000000..10fa14c5 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/push-to-checkout.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/push-to-checkout.sample new file mode 100755 index 00000000..af5a0c00 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/push-to-checkout.sample @@ -0,0 +1,78 @@ +#!/bin/sh + +# An example hook script to update a checked-out tree on a git push. +# +# This hook is invoked by git-receive-pack(1) when it reacts to git +# push and updates reference(s) in its repository, and when the push +# tries to update the branch that is currently checked out and the +# receive.denyCurrentBranch configuration variable is set to +# updateInstead. +# +# By default, such a push is refused if the working tree and the index +# of the remote repository has any difference from the currently +# checked out commit; when both the working tree and the index match +# the current commit, they are updated to match the newly pushed tip +# of the branch. This hook is to be used to override the default +# behaviour; however the code below reimplements the default behaviour +# as a starting point for convenient modification. +# +# The hook receives the commit with which the tip of the current +# branch is going to be updated: +commit=$1 + +# It can exit with a non-zero status to refuse the push (when it does +# so, it must not modify the index or the working tree). +die () { + echo >&2 "$*" + exit 1 +} + +# Or it can make any necessary changes to the working tree and to the +# index to bring them to the desired state when the tip of the current +# branch is updated to the new commit, and exit with a zero status. +# +# For example, the hook can simply run git read-tree -u -m HEAD "$1" +# in order to emulate git fetch that is run in the reverse direction +# with git push, as the two-tree form of git read-tree -u -m is +# essentially the same as git switch or git checkout that switches +# branches while keeping the local changes in the working tree that do +# not interfere with the difference between the branches. + +# The below is a more-or-less exact translation to shell of the C code +# for the default behaviour for git's push-to-checkout hook defined in +# the push_to_deploy() function in builtin/receive-pack.c. +# +# Note that the hook will be executed from the repository directory, +# not from the working tree, so if you want to perform operations on +# the working tree, you will have to adapt your code accordingly, e.g. +# by adding "cd .." or using relative paths. + +if ! git update-index -q --ignore-submodules --refresh +then + die "Up-to-date check failed" +fi + +if ! git diff-files --quiet --ignore-submodules -- +then + die "Working directory has unstaged changes" +fi + +# This is a rough translation of: +# +# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX +if git cat-file -e HEAD 2>/dev/null +then + head=HEAD +else + head=$(git hash-object -t tree --stdin &2 + exit 1 +} + +unset GIT_DIR GIT_WORK_TREE +cd "$worktree" && + +if grep -q "^diff --git " "$1" +then + validate_patch "$1" +else + validate_cover_letter "$1" +fi && + +if test "$GIT_SENDEMAIL_FILE_COUNTER" = "$GIT_SENDEMAIL_FILE_TOTAL" +then + git config --unset-all sendemail.validateWorktree && + trap 'git worktree remove -ff "$worktree"' EXIT && + validate_series +fi diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/update.sample b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/update.sample new file mode 100755 index 00000000..c4d426bc --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to block unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --type=bool hooks.allowunannotated) +allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) +denycreatebranch=$(git config --type=bool hooks.denycreatebranch) +allowdeletetag=$(git config --type=bool hooks.allowdeletetag) +allowmodifytag=$(git config --type=bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero=$(git hash-object --stdin &2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/index b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/index new file mode 100644 index 0000000000000000000000000000000000000000..35a2def9a3c14d85e7c5aa9c2f2166ca0199739f GIT binary patch literal 428 zcmZ?q402{*U|<4b<}_QjI!?pvM=+X^fk8+l|BVj=L*o(#2F7ndH6lP<(z_|?=&sq* zE-%W8(-yWD7M$|rrziuLUV3IpW_n(JQ7TXk7^K;yYsvmi(SgxW^JW0edy8aV^QV9V zCKDGPRyrpg_~ez+j6!kKbFUdxii#`ql64dFO7e>mb&FEdQj1dal2i4Ii<0#dlS?x5 z^Yn@{VD=em!jbbnY zDz^`OeRA94AO3X_|8H{Ez1-&U>Ebq^SAcQ`TmgA3?Dw}?1Q%K9+p8?#$PM1RA*RY? X-SP6ts$CB^t8(UN+_3+i&ZGhWHTsjQ literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/info/exclude b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/info/exclude new file mode 100644 index 00000000..a5196d1b --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/HEAD b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/HEAD new file mode 100644 index 00000000..429a0398 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/HEAD @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 0d0095113b5be7f4fcdfc972268318ec902c5f13 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715194973 -0400 commit (initial): initial commit +0d0095113b5be7f4fcdfc972268318ec902c5f13 c7c3fa38fd33170e7fbb15541066ebe746ba1ad6 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715202289 -0400 commit: moving action.sh +c7c3fa38fd33170e7fbb15541066ebe746ba1ad6 18c66e805702c81fc2099cb09d2490f099581f34 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715260171 -0400 commit: changing permissions +18c66e805702c81fc2099cb09d2490f099581f34 193a7a691db1f7529bbd1d7f7f4947209622486c Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715263189 -0400 commit: updating action +193a7a691db1f7529bbd1d7f7f4947209622486c b460e89cc9afdb4ecc7c1c3e4e0e1dae0cac7e63 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715364505 -0400 commit: adding setup_ssh.sh +b460e89cc9afdb4ecc7c1c3e4e0e1dae0cac7e63 9858d6e0d948d69e62cca0e393dfb21cfb4d7781 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715712689 -0400 commit: adding jenkins.sh +9858d6e0d948d69e62cca0e393dfb21cfb4d7781 ba9d397eb47402a7e9d00a6e529285341a35168b Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715712751 -0400 commit: removed runme +ba9d397eb47402a7e9d00a6e529285341a35168b 3c1914e048ad43880aecf0ce0ad4d3a5220df39b Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715712928 -0400 commit: making jenkins.sh executable +3c1914e048ad43880aecf0ce0ad4d3a5220df39b 018554f12b64fc2fb8a0ea306455c8d0da30b891 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1716557772 -0400 commit: removing jenkins.sh diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/refs/heads/main b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/refs/heads/main new file mode 100644 index 00000000..429a0398 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/logs/refs/heads/main @@ -0,0 +1,9 @@ +0000000000000000000000000000000000000000 0d0095113b5be7f4fcdfc972268318ec902c5f13 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715194973 -0400 commit (initial): initial commit +0d0095113b5be7f4fcdfc972268318ec902c5f13 c7c3fa38fd33170e7fbb15541066ebe746ba1ad6 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715202289 -0400 commit: moving action.sh +c7c3fa38fd33170e7fbb15541066ebe746ba1ad6 18c66e805702c81fc2099cb09d2490f099581f34 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715260171 -0400 commit: changing permissions +18c66e805702c81fc2099cb09d2490f099581f34 193a7a691db1f7529bbd1d7f7f4947209622486c Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715263189 -0400 commit: updating action +193a7a691db1f7529bbd1d7f7f4947209622486c b460e89cc9afdb4ecc7c1c3e4e0e1dae0cac7e63 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715364505 -0400 commit: adding setup_ssh.sh +b460e89cc9afdb4ecc7c1c3e4e0e1dae0cac7e63 9858d6e0d948d69e62cca0e393dfb21cfb4d7781 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715712689 -0400 commit: adding jenkins.sh +9858d6e0d948d69e62cca0e393dfb21cfb4d7781 ba9d397eb47402a7e9d00a6e529285341a35168b Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715712751 -0400 commit: removed runme +ba9d397eb47402a7e9d00a6e529285341a35168b 3c1914e048ad43880aecf0ce0ad4d3a5220df39b Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1715712928 -0400 commit: making jenkins.sh executable +3c1914e048ad43880aecf0ce0ad4d3a5220df39b 018554f12b64fc2fb8a0ea306455c8d0da30b891 Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> 1716557772 -0400 commit: removing jenkins.sh diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/01/8554f12b64fc2fb8a0ea306455c8d0da30b891 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/01/8554f12b64fc2fb8a0ea306455c8d0da30b891 new file mode 100644 index 0000000000000000000000000000000000000000..9e05b4fdbf4ce182bbeff0159580d55551163b26 GIT binary patch literal 188 zcmV;t07L(H0j-WvZo?oDMElJt_CJaR%Mw7Us;Eck4FIoWr!_<+c1S`2ttY-%H+xZ59tOo|5MONo literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/05/9bda736a5d7cefefb199b1187e59994f6f1221 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/05/9bda736a5d7cefefb199b1187e59994f6f1221 new file mode 100644 index 0000000000000000000000000000000000000000..5af0320e7416ce74f11d53e43db6a582602c4d69 GIT binary patch literal 45 zcmV+|0Mh?>0V^p=O;s>9U@$QN0)^tDWQIwz!&I0Z1dnKk@Uoxzr2OiGY{W$X)|3q6 DgxVA} literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/0d/0095113b5be7f4fcdfc972268318ec902c5f13 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/0d/0095113b5be7f4fcdfc972268318ec902c5f13 new file mode 100644 index 00000000..e9aefade --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/0d/0095113b5be7f4fcdfc972268318ec902c5f13 @@ -0,0 +1,2 @@ +xK +0aYŝ%I ".$Fڦ)u N?8?K H9t!%;;ܶ=3!e~pֲ1W{])2#a M +@W'(s,я7K] \ No newline at end of file diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/0d/65649266e723e7033103f9b6ae757ec6580057 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/0d/65649266e723e7033103f9b6ae757ec6580057 new file mode 100644 index 00000000..8a1aad43 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/0d/65649266e723e7033103f9b6ae757ec6580057 @@ -0,0 +1,2 @@ +x=M ]s +F{GcGFJCi#]||38D76S0VZqNFhF!jI.m a$Wgy>ݾs8&cmiesL~y69Vuz$'.8'$6 \ No newline at end of file diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/0f/5f2470dfcc0e605318d3559a527b90d3200f4d b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/0f/5f2470dfcc0e605318d3559a527b90d3200f4d new file mode 100644 index 0000000000000000000000000000000000000000..759614722194f39092d82c8a7eed4f178180d987 GIT binary patch literal 46 zcmb6v1^THKsmY}!sVVUwg3| zPI>ZE)WiS?6pD%~^OAKF^GfoI5_OAG(^894^O92;F4r@^R&iRN@xt(V*vhSzhmXzs Kr2znN(Ix&zqcMa4 literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/31/914a902c49e2929047e4d716ea82715c6c403f b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/31/914a902c49e2929047e4d716ea82715c6c403f new file mode 100644 index 0000000000000000000000000000000000000000..e5790613ce7a10c4d842c5bd39781a006d8d66de GIT binary patch literal 54 zcmV-60LlM&0V^p=O;s>9XD~D{FgG<-NK7ut%+J#+&S04M!sF&L`HQnE7`RWaaq<9XD~D{FgG<-NK7ut%+J#+&S1z-$@4b-wyODUZozgh-hl5J MGF#6A08Y{o9Yq%x5C8xG literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/3c/1914e048ad43880aecf0ce0ad4d3a5220df39b b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/3c/1914e048ad43880aecf0ce0ad4d3a5220df39b new file mode 100644 index 00000000..6bf84e23 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/3c/1914e048ad43880aecf0ce0ad4d3a5220df39b @@ -0,0 +1,3 @@ +xAn 9Z07i#uz-~=^enɼ*آi )j Ğ88T4ȔdF + ΐYަ +Ѥ‡Gޝag_&uZ~{vM{x]>ye];աWj\*ح&(D?^[ \ No newline at end of file diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/3f/51ebc9b6a3f84f7e58ffd9097ee9b648f2d1b6 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/3f/51ebc9b6a3f84f7e58ffd9097ee9b648f2d1b6 new file mode 100644 index 0000000000000000000000000000000000000000..5622effbef59dd09f8e27897cf5617074b5f46bd GIT binary patch literal 45 zcmbAXD~D{FgG<-NK7ut%+J#+&S3ZyaKL2Z!oy1EqywM4QkqdH uZhG!DR8etiNohfRad8GnUCb-#fOXmvycaCCY@A?tt>;0QxeWj_d?5rq0VLx9 literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/56/b2a3e3988df09963b2f925a7fb7500a9d1a928 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/56/b2a3e3988df09963b2f925a7fb7500a9d1a928 new file mode 100644 index 0000000000000000000000000000000000000000..68a0233c036c3c74dedbee28ec42e1a1e3a72b87 GIT binary patch literal 45 zcmbxw@v9f%6Q%831!i B5qJOq literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/5b/13c12d6cbaae95d5c70435559222c9e531d9a5 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/5b/13c12d6cbaae95d5c70435559222c9e531d9a5 new file mode 100644 index 0000000000000000000000000000000000000000..6ca3717696202d440cf769526bd1d242127c1431 GIT binary patch literal 104 zcmV-u0GI!G0V^p=O;xZkXD~D{Ff%bx&`ZxO$xP47FG^+T-IR26*X(JR7iGn13)>3| zPI>ZE)WiS?6pD%~^OAKF^GfoI5_OAG(^894^O92;uAkLvuk*?bxVB{4p39f^MQuBk Kt^xph+$MEXaxkp` literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/5c/ea1b50ae2b904ba0a339819031d68ce056373c b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/5c/ea1b50ae2b904ba0a339819031d68ce056373c new file mode 100644 index 0000000000000000000000000000000000000000..cbd9030cbe65f982b28597b9822cad1b70242de1 GIT binary patch literal 46 zcmb3| zPI>ZE)WiS?6pD%~^OAKF^GfoI5_OAG(^894^O92;_~TUy?w{dH2$r}UIxDDp!es@1 JUjS8MBLDl2EwBIp literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/68/0da9cd210b268fcc51b3218f87043632388372 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/68/0da9cd210b268fcc51b3218f87043632388372 new file mode 100644 index 0000000000000000000000000000000000000000..2ffd0d3ee08b59c31e38cf671051f61d9f0546a7 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;xZkXD~D{Ff%bx&`ZxO$xP47FG^+T-IR26*X(JR7iGn13)>3| zPI>ZE)WiS?6pD%~^OAKF^GfoI5_OAG(^894^O92;9=1i?md)3!uv5**$$evAWIAav J4*+3VBZ&zGE(`zw literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/6f/646e4b35f6aa83ed6d70b74a0d50f7681cb5cd b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/6f/646e4b35f6aa83ed6d70b74a0d50f7681cb5cd new file mode 100644 index 0000000000000000000000000000000000000000..674584ce718813e1501dcfbc89bd4d06b323ade2 GIT binary patch literal 73 zcmV-P0Ji^l0ZYosPf{>9Vo+ApPs+^GPf9G#;NnV6&d66#3a-pcPEAor$xkj;f(WT2 f38^dCDd?Bv7U-u|q$Zb^q^87!6mkIodQ4#FT5gk5tA_D1q3f0`I$Jc2g>`igC&G?X@Sdx;BolP{BRrr1Ea zk%#0a^o4rk#bCvG=!M`0&yrS#EnxN?nlp6ysP(X^tHjFy6Qg0W*D8 zJJW~#l$Nimlbw>s+}PxP?7pp-S2m}N%e%5Lme=N3)7{z`t~w0>7kUB-KuD}~Z|yP7 K|CKNL={Jv#Wlb>v literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/76/ba2479a8e84ab5431193251c8804efb4736575 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/76/ba2479a8e84ab5431193251c8804efb4736575 new file mode 100644 index 00000000..6b33500e --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/76/ba2479a8e84ab5431193251c8804efb4736575 @@ -0,0 +1,2 @@ +x=M ]s +FGcG@_k- ^tdfܓ|V"6C4` 5JAֱ>LӘX*;@߳;SQ c]*iye19Q.4T )0W>d7 \ No newline at end of file diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/88/9850e6e4256269c906a85b252073b9b71deb1d b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/88/9850e6e4256269c906a85b252073b9b71deb1d new file mode 100644 index 0000000000000000000000000000000000000000..2cbe1476f027915a38c67e9c37aa349e13f1164e GIT binary patch literal 88 zcmV-e0H^AWiT`_Ff%bx&`ZxO$xP47FG^+T-IR26*X(JR7iGn13)>3| uPI>ZE6sjsQxg;|`Pp>$GVd4vqo6F=c&Z=PGKDoxpS7@qweg**6gdYPoLnZJ4 literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/8d/b262c5ba9b96d3a26a5e2b133f131194e4f915 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/8d/b262c5ba9b96d3a26a5e2b133f131194e4f915 new file mode 100644 index 0000000000000000000000000000000000000000..107086caa8602a68435c07be3b99ca1bfe6ebf83 GIT binary patch literal 115 zcmV-(0F3{50UeAn4#F@DMVWmHq;4J@b?E`P2y%ldK_RhhBh;m5C$PN#q%Xa-_Vql^ z%Lxyd5O4w-L%FiMay)?4`crZMxkQw>}J8f^CyXaP<;0zH$==r1GjissY_O VN4Nc-L-LP8%Dwr!egQQICwL=lGtdA4 literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/91/e848d9a61fd19a78000bc9ac424d1295276f68 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/91/e848d9a61fd19a78000bc9ac424d1295276f68 new file mode 100644 index 0000000000000000000000000000000000000000..9c0c2bde60b868af294dfbaae92cd804ed956056 GIT binary patch literal 48 zcmV-00MGw;0ZYosPf{>8Vo+ApPs+^GPf9G#;NnV6&d66#3a-pcPEAor$xkj;;sOBf G)C=w%hZb4@ literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/92/9b5624034011c42b540d07ccf223eaf01d58d1 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/92/9b5624034011c42b540d07ccf223eaf01d58d1 new file mode 100644 index 0000000000000000000000000000000000000000..74ec604c0ea0cf580523eb2796e6370d08718a47 GIT binary patch literal 154 zcmV;L0A>Gp0V^p=O;s>7HDoX}FfcbYRY*)O$;{8wE6!l}6mY;~;=;p9=cEIlyi%G` zC~kW0HBgb6iHSm1YF>6`UNK13M~*}L^zIeu=*aPVH_bS*uIbu|PN=G)(!AVMuu1AF zd^=q&l~xoV{n%Kib}wYFU<1^;;?$DTg81U%43N5*SJDCNv?q8kSZvui!SGtogD`U& I0OJWh4CNAXD~D{FgG<-NK7ut%+J#+&R~$+*t6Us^m}Q=`mYLU%j0w6 uWy{_`6&0tJlorGn7iWOf#k`UZSf@R~d%!z&1s#3fn*4lFl^^uo(d4T$);RmzPP?W*dp~xxeW+W*{p&GYmOdY8;B9@A oI%pTP@l%v9$|@yJJ=cFj{}>gN^HMMJih5h>KJ2sj0lNZRdE4uUWcMP2t4-5Z-JOp7GO7?0o$+F?YDP*Mu9x3{`*_w(}e{!gx# zy1`xWPo^Y2THs?#)Vh1;k%=18R5LQL?i>R-YS`8y<(VagaU7CJ#j$|`rR_KO9OW&$ zNnYJMm3%T4RtER6u&4jA%ert})D$AmudMnZJyx%Z?p)4jQ(H6@$O9mN5M!2GX%Aug KuY3TXVK}l0HcLkU literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/a8/8e84ce082bf3ebbcfe497949499e99c6cb2c10 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/a8/8e84ce082bf3ebbcfe497949499e99c6cb2c10 new file mode 100644 index 0000000000000000000000000000000000000000..49762c8a3ff9b9a69607d4fa7be1c9265fb08615 GIT binary patch literal 104 zcmV-u0GI!G0V^p=O;xZkXD~D{Ff%bx&`ZxO$xP47FG^+T-IR26*X(JR7iGn13)>3| zPI>ZE)WiS?6pD%~^OAKF^GfoI5_OAG(^894^O92;>;qq)+_w0Ke_h1?o1Aqow|RWJ KxD5b+ODBX!_%Hnc literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/ae/f500da0cf73a881df5e7d7ddf0d6533d5f2610 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/ae/f500da0cf73a881df5e7d7ddf0d6533d5f2610 new file mode 100644 index 0000000000000000000000000000000000000000..0532386f561b7e3a36e5639333d2411ed802f777 GIT binary patch literal 155 zcmV;M0A&Ao0X>dE4#FT5L|t3| zPI>ZE)WiS?6pD%~^OAKF^GfoI5_OAG(^894^O92;wwr~qGFl3#DJB>Ps`1RYZZA{R J0RT7@Aim+0EF}N{ literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/ae/f9cb234b65b9d6692e7deaffb2d005e2679ef5 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/ae/f9cb234b65b9d6692e7deaffb2d005e2679ef5 new file mode 100644 index 0000000000000000000000000000000000000000..d3d1c264967e9ce7d8dc7cc582c294cbbe08ead9 GIT binary patch literal 103 zcmV-t0GR)H0V^p=O;xZkXD~D{Ff%bx&`ZxO$xP47FG^+T-IR26*X(JR7iGn13)>3| zPI>ZE)WiS?6pD%~^OAKF^GfoI5_OAG(^894^O92;SZCiV&Wf#h|9<1ljS_W{GyU_0 J6ajCUB#jQ literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/b4/60e89cc9afdb4ecc7c1c3e4e0e1dae0cac7e63 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/b4/60e89cc9afdb4ecc7c1c3e4e0e1dae0cac7e63 new file mode 100644 index 0000000000000000000000000000000000000000..e2f1d1fd05bc5da5f14c729fbc9fe2939d4eba3c GIT binary patch literal 187 zcmV;s07U6 \ No newline at end of file diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/b7/3656050139102621603351260c98d73f1c7288 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/b7/3656050139102621603351260c98d73f1c7288 new file mode 100644 index 0000000000000000000000000000000000000000..380f2bc7e19fe8ad45f0db1151ce540fc195c8d7 GIT binary patch literal 45 zcmV+|0Mh?>0V^p=O;s>9U@$QN0)^tDWCp{DUK4aYA5EIz{^YvYtER%390z*<>_iRW DZq^cn literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/ba/9d397eb47402a7e9d00a6e529285341a35168b b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/ba/9d397eb47402a7e9d00a6e529285341a35168b new file mode 100644 index 0000000000000000000000000000000000000000..7bde056899ad640efcffe252c1db0bc0fa468f6f GIT binary patch literal 184 zcmV;p07w6L0j~0sL_C5ws3a91r0LTMRm2oV(R^E5=i-)Ylt^gUVhv$JR&KFVRA`OjYW8_R9khVb=rUp~(BwCAOa m{-Pm(3t)o-{bbM>b?9;ZH}sEDCEUjsS1tS2S^WT^eOaOSO9XD~D{Ff%bxNK7ut%+J#+&S04M!sF&L`HQnE7`RWaaq<i2SaNX`2YX_ literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/c1/eb48842df92c8f185796de35a43f789363eeab b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/c1/eb48842df92c8f185796de35a43f789363eeab new file mode 100644 index 0000000000000000000000000000000000000000..ea5fefecc7db3f9cec8675d65307a663ec094fa5 GIT binary patch literal 157 zcmV;O0Al}m0X>dE4#FT5L|tVX8 zY}6r`(b>eI1JHz688WW%%G=Ic-AGxVD?B@^L0a-yv6L6bZJ4GZu~Zy82oP9*bMGR5 zXsJJbjvG?en`*Fh@!ieGf1cjNb(aX0LG@w_tGB1 L{9pM1t8h09q&!Q) literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/c7/c3fa38fd33170e7fbb15541066ebe746ba1ad6 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/c7/c3fa38fd33170e7fbb15541066ebe746ba1ad6 new file mode 100644 index 00000000..bfb37c55 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/c7/c3fa38fd33170e7fbb15541066ebe746ba1ad6 @@ -0,0 +1 @@ +xQN q9żacG05[Pj ~>۶v)<&ce 1Y1[lR:&$Sa"#]Fţ/=?]:s;+KۇRܮH !Qz^1 Dk-þ_Z \ No newline at end of file diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/d3/7f03eb2442af68e831e756a9b539c3c69efa28 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/d3/7f03eb2442af68e831e756a9b539c3c69efa28 new file mode 100644 index 0000000000000000000000000000000000000000..a852c20277cdc1575c4547c5d0219bf14aeac599 GIT binary patch literal 45 zcmV+|0Mh?>0V^p=O;s>9U@$QN0)^tDWQHG(6C_HHcbV}P|IL#>ct@uEY78*=~G`>#XQ~r>q~!QXx@BLhTD0(oB()@ B5<~z1 literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/e0/54f6a8bc5c3983e5fba7c129e4b1101d263b6c b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/e0/54f6a8bc5c3983e5fba7c129e4b1101d263b6c new file mode 100644 index 0000000000000000000000000000000000000000..f9d16de456758811d48167b022b262daf3cca6f7 GIT binary patch literal 125 zcmV-@0D}K`0V^p=O;s>7G-WU}FfcbYRY*)O$;{8wE6!l}6mY;~;=;p9=cEIlyi%G` zC~kW0HBgb6iHSm1YF>6`UNK13M~*}L^zIeu=*aPVH_bS*uIbu|PN-4EsU@Wa@x{d% fAayaXqyyGzPw-x_*s^hg;kBLzVdgdfL`yJp;Ho>y literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/e1/8658db1d6f29783e25686c6dec3f723592a30c b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/e1/8658db1d6f29783e25686c6dec3f723592a30c new file mode 100644 index 0000000000000000000000000000000000000000..98bd7c61d751489fac5ff342b6a1610cd8509e65 GIT binary patch literal 46 zcmb6HD^#()KALH(@#n)&fwxwR&Y-(Q7FksRY)!^DoV{OQAo)w zN=+`wFRJ8%io^p&Y*jQ0%2PB!>K#*3u&Y-n$p=dWIEHvAlqD8rCMM;ia-~)jooZ,M뻺z5Ə<N RNNkhWZGd@5LG.N=l^m_$ "VfRZjoJmNGaj%tLz#N!B㺲8I)CߍeyTeYz3+e '?)s{y~;'$=G\5!Vdv/'45co%! @Ⱦ##nP!;D* \ No newline at end of file diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/f2/50c03491a1c322ce1b51e4ea2298711735ceeb b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/f2/50c03491a1c322ce1b51e4ea2298711735ceeb new file mode 100644 index 0000000000000000000000000000000000000000..1808386d8c654cf797b587c7a23f3451d155a4bb GIT binary patch literal 112 zcmV-$0FVE80ZYosPf{>6He^s%)KALH(@#n)&fqFeEm6=-g-~f+AiA_5zPLC;4=Bf# znw*iZpcGu0mzESElEv@2Pp*Vt;j5iPtH$C SwN3| zPI>ZE)WiS?6pD%~^OAKF^GfoI5_OAG(^894^O92;!Zs~_Jfru+%;Zf!RhR!RWmtJ} Kr3L_mekR;3ST4%| literal 0 HcmV?d00001 diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/f8/41901875c78a360d73fd6e1fc1dc1c77c9a993 b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/git/objects/f8/41901875c78a360d73fd6e1fc1dc1c77c9a993 new file mode 100644 index 0000000000000000000000000000000000000000..d9286f36d71b2e9e20e41c2e9d0630b98aa5ec7d GIT binary patch literal 121 zcmV-<0EYi~0V^p=O;s>7G-WU}FfcbYRY*)O$;{8wE6!l}6mY;~;=;p9=cEIlyi%G` zC~kW0HB?bnYF>6`UNK13M~*}L^zIeu=*aPVH_bS*uIbu|PN=Hl)RNMI_~POWkh+*x b(gEwVCwMPdY}q)$@LJD /tmp/executed_docs + +exit_code=$? + +exit $exit_code diff --git a/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/rsync-antora-reference/src/setup_ssh.sh b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/rsync-antora-reference/src/setup_ssh.sh new file mode 100755 index 00000000..5cea1b50 --- /dev/null +++ b/projects/spring-cloud/src/test/resources/projects/spring-docs-actions/rsync-antora-reference/src/setup_ssh.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +echo "Setup ssh" diff --git a/projects/spring-cloud/src/test/resources/spring-docs-action-runner.sh b/projects/spring-cloud/src/test/resources/spring-docs-action-runner.sh new file mode 100755 index 00000000..f108c2be --- /dev/null +++ b/projects/spring-cloud/src/test/resources/spring-docs-action-runner.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +# Get the current directory +current_dir=$(pwd) + +# Add the current directory to the PATH variable +export PATH=$PATH:$current_dir + +action.sh "$@" diff --git a/releaser-core/src/main/java/releaser/internal/Releaser.java b/releaser-core/src/main/java/releaser/internal/Releaser.java index fe8ba8a7..336adc9d 100644 --- a/releaser-core/src/main/java/releaser/internal/Releaser.java +++ b/releaser-core/src/main/java/releaser/internal/Releaser.java @@ -90,6 +90,15 @@ public class Releaser { return this.projectGitHandler.cloneProjectFromOrg(projectName); } + public ExecutionResult buildAntoraDocs(File project) { + String currentBranch = projectGitHandler.currentBranch(project); + projectGitHandler.cloneAndCheckoutDocsBuild(project); + this.projectCommandExecutor.runAntora(this.releaserProperties, originalVersion(project), + new ProjectVersion(project), project.getAbsolutePath()); + projectGitHandler.checkout(project, currentBranch); + return ExecutionResult.success(); + } + public Projects retrieveVersionsFromBom() { return this.projectPomUpdater.retrieveVersionsFromReleaseTrainBom(); } @@ -122,6 +131,12 @@ public class Releaser { return ExecutionResult.success(); } + public ExecutionResult runAntoraBuild(ReleaserProperties properties, ProjectVersion originalVersion, + ProjectVersion versionFromBom) { + this.projectCommandExecutor.runAntora(properties, originalVersion, versionFromBom, properties.getWorkingDir()); + return ExecutionResult.success(); + } + public ExecutionResult commitAndPushTags(File project, ProjectVersion changedVersion) { this.projectGitHandler.commitAndTagIfApplicable(project, changedVersion); log.info("\nCommit was made and tag was pushed successfully"); @@ -135,9 +150,9 @@ public class Releaser { return ExecutionResult.success(); } - public ExecutionResult publishDocs(ReleaserProperties properties, ProjectVersion originalVersion, - ProjectVersion changedVersion) { - this.projectCommandExecutor.publishDocs(properties, originalVersion, changedVersion); + public ExecutionResult publishDocs(ReleaserProperties properties, File project) { + File springDocsActionsProject = this.projectGitHandler.cloneAndCheckoutSpringDocsActions(); + this.projectCommandExecutor.publishAntoraDocs(springDocsActionsProject, project, properties); log.info("\nThe docs were published successfully"); return ExecutionResult.success(); } diff --git a/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java b/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java index 5176229f..ddea821f 100644 --- a/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java +++ b/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java @@ -78,6 +78,8 @@ public class ReleaserProperties implements Serializable { private Versions versions = new Versions(); + private Antora antora = new Antora(); + private boolean commercial = false; /** @@ -208,12 +210,21 @@ public class ReleaserProperties implements Serializable { this.commercial = commercial; } + public Antora getAntora() { + return antora; + } + + public void setAntora(Antora antora) { + this.antora = antora; + } + @Override public String toString() { return "ReleaserProperties{" + "workingDir='" + this.workingDir + '\'' + ", git=" + this.git + ", pom=" + this.pom + ", maven=" + this.maven + ", gradle=" + this.gradle + ", sagan=" + this.sagan + ", fixedVersions=" + this.fixedVersions + ", metaRelease=" + this.metaRelease + ", template=" - + this.template + ", versions=" + this.versions + ", commercial=" + this.commercial + '}'; + + this.template + ", versions=" + this.versions + ", commercial=" + this.commercial + ", antora=" + + this.antora + '}'; } public ReleaserProperties copy() { @@ -436,6 +447,87 @@ public class ReleaserProperties implements Serializable { } + public static class Antora implements Serializable { + + /** + * URL to Spring Docs Actions repo. + */ + private String springDocsActionsUrl; + + /** + * Command to sync Antora docs. + */ + private String syncAntoraDocsCommand; + + /** + * Tag for Spring Docs Actions repo. + */ + private String springDocsActionsTag; + + private String springDocsSshUsername; + + private String springDocsSshKeyPath; + + private String springDocsSshHostKey; + + public String getSpringDocsActionsUrl() { + return springDocsActionsUrl; + } + + public void setSpringDocsActionsUrl(String springDocsActionsUrl) { + this.springDocsActionsUrl = springDocsActionsUrl; + } + + public String getSpringDocsActionsTag() { + return springDocsActionsTag; + } + + public void setSpringDocsActionsTag(String springDocsActionsTag) { + this.springDocsActionsTag = springDocsActionsTag; + } + + public String getSyncAntoraDocsCommand() { + return syncAntoraDocsCommand; + } + + public void setSyncAntoraDocsCommand(String syncAntoraDocsCommand) { + this.syncAntoraDocsCommand = syncAntoraDocsCommand; + } + + public String getSpringDocsSshUsername() { + return springDocsSshUsername; + } + + public void setSpringDocsSshUsername(String springDocsSshUsername) { + this.springDocsSshUsername = springDocsSshUsername; + } + + public String getSpringDocsSshKeyPath() { + return springDocsSshKeyPath; + } + + public void setSpringDocsSshKeyPath(String springDocsSshKeyPath) { + this.springDocsSshKeyPath = springDocsSshKeyPath; + } + + public String getSpringDocsSshHostKey() { + return springDocsSshHostKey; + } + + public void setSpringDocsSshHostKey(String springDocsSshHostKey) { + this.springDocsSshHostKey = springDocsSshHostKey; + } + + @Override + public String toString() { + return "Antora{" + "springDocsActionsUrl='" + springDocsActionsUrl + '\'' + ", syncAntoraDocsCommand='" + + syncAntoraDocsCommand + '\'' + ", springDocsActionsTag='" + springDocsActionsTag + '\'' + + ", springDocsSshUsername='" + springDocsSshUsername + '\'' + ", springDocsSshKey='" + + springDocsSshKeyPath + '\'' + ", springDocsSshHostKey='" + springDocsSshHostKey + '\'' + '}'; + } + + } + public static class Git implements Serializable { /** @@ -1021,6 +1113,11 @@ 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}}"; + /** * Additional system properties that should be passed to the build / deploy * commands. If present in other commands "{{systemProps}}" will be substituted @@ -1101,12 +1198,20 @@ public class ReleaserProperties implements Serializable { this.systemProperties = systemProperties; } + public String getRunAntoraCommand() { + return runAntoraCommand; + } + + public void setRunAntoraCommand(String runAntoraCommand) { + this.runAntoraCommand = runAntoraCommand; + } + @Override public String toString() { return "Maven{" + "buildCommand='" + this.buildCommand + '\'' + ", deployCommand='" + this.deployCommand + '\'' + ", publishDocsCommand=" + this.publishDocsCommand + "generateReleaseTrainDocsCommand='" - + this.generateReleaseTrainDocsCommand + '\'' + ", waitTimeInMinutes=" + this.waitTimeInMinutes - + '}'; + + this.generateReleaseTrainDocsCommand + '\'' + ", runAntoraCommand= " + runAntoraCommand + + ", waitTimeInMinutes=" + this.waitTimeInMinutes + '}'; } } @@ -1316,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; @@ -1400,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() + "[", "]") @@ -1409,6 +1527,7 @@ public class ReleaserProperties implements Serializable { .add("deployGuidesCommand='" + deployGuidesCommand + "'") .add("publishDocsCommand=" + publishDocsCommand) .add("generateReleaseTrainDocsCommand='" + generateReleaseTrainDocsCommand + "'") + .add("runAntoraCommand='" + runAntoraCommand + "'") .add("systemProperties='" + systemProperties + "'").add("waitTimeInMinutes=" + waitTimeInMinutes) .toString(); } diff --git a/releaser-core/src/main/java/releaser/internal/git/GitRepo.java b/releaser-core/src/main/java/releaser/internal/git/GitRepo.java index 49096bf2..12b24a49 100644 --- a/releaser-core/src/main/java/releaser/internal/git/GitRepo.java +++ b/releaser-core/src/main/java/releaser/internal/git/GitRepo.java @@ -184,6 +184,21 @@ class GitRepo { } } + void checkoutTag(String tagName) { + try (Git git = this.gitFactory.open(file(this.basedir))) { + Optional tagId = findTagIdByName(tagName, false); + if (tagId.isPresent()) { + git.checkout().setName(tagId.get().getName()).call(); + } + else { + throw new IllegalStateException("Tag with name [" + tagName + "] not found"); + } + } + catch (Exception e) { + throw new IllegalStateException(e); + } + } + /** * Attempt to retrieve a tag id from a name, prepending the name with /refs/tags/. */ diff --git a/releaser-core/src/main/java/releaser/internal/git/ProjectGitHandler.java b/releaser-core/src/main/java/releaser/internal/git/ProjectGitHandler.java index fcdf3eb8..431893cb 100644 --- a/releaser-core/src/main/java/releaser/internal/git/ProjectGitHandler.java +++ b/releaser-core/src/main/java/releaser/internal/git/ProjectGitHandler.java @@ -130,6 +130,16 @@ public class ProjectGitHandler implements Closeable { this.properties.getGit().getSpringProjectBranch()); } + public void cloneAndCheckoutDocsBuild(File project) { + checkout(project, "docs-build"); + } + + public File cloneAndCheckoutSpringDocsActions() { + File project = cloneProject(this.properties.getAntora().getSpringDocsActionsUrl()); + checkoutTag(project, this.properties.getAntora().getSpringDocsActionsTag()); + return project; + } + private File cloneAndCheckOut(String springProjectUrl, String springProjectUrlBranch) { File clonedProject = cloneProject(springProjectUrl); checkout(clonedProject, springProjectUrlBranch); @@ -146,12 +156,7 @@ public class ProjectGitHandler implements Closeable { * @return location of the cloned project */ public File cloneProjectFromOrg(String projectName) { - String orgUrl = this.properties.getMetaRelease().getGitOrgUrl(); - String fullUrl = orgUrl.endsWith("/") ? (orgUrl + projectName) - : (orgUrl + "/" + addCommercialSuffix(projectName) + suffixNonHttpRepo(orgUrl)); - if (log.isDebugEnabled()) { - log.debug("Full url of the project is [{}]", fullUrl); - } + String fullUrl = createRepoUrlFromProject(projectName); File clonedProject = cloneProject(fullUrl); if (log.isDebugEnabled()) { log.debug("Successfully cloned the project to [{}]", clonedProject); @@ -192,6 +197,16 @@ public class ProjectGitHandler implements Closeable { return findAndCheckOutBranchForVersion(clonedProject, versions); } + private String createRepoUrlFromProject(String projectName) { + String orgUrl = this.properties.getMetaRelease().getGitOrgUrl(); + String fullUrl = orgUrl.endsWith("/") ? (orgUrl + projectName) + : (orgUrl + "/" + addCommercialSuffix(projectName) + suffixNonHttpRepo(orgUrl)); + if (log.isDebugEnabled()) { + log.debug("Full url of the project is [{}]", fullUrl); + } + return fullUrl; + } + private File findAndCheckOutBranchForVersion(File clonedProject, String[] versions) { if (log.isDebugEnabled()) { log.debug("Checking versions {} for project [{}]", versions, clonedProject); @@ -271,6 +286,11 @@ public class ProjectGitHandler implements Closeable { return new File(destinationFolder, projectUrl.getHumanishName()); } + public void checkoutTag(File project, String tag) { + log.info("checkout tag: " + tag); + gitRepo(project).checkoutTag(tag); + } + public void checkout(File project, String branch) { log.info("checkout project: " + project + " with branch: " + branch); gitRepo(project).checkout(branch); 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 050600d5..504e6167 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -37,6 +37,7 @@ import org.slf4j.LoggerFactory; import releaser.internal.ReleaserProperties; import releaser.internal.tech.ReleaserProcessExecutor; +import org.springframework.core.io.ClassPathResource; import org.springframework.util.StringUtils; /** @@ -52,6 +53,13 @@ public class ProjectCommandExecutor { private static final String NEXT_VERSION_MUSTACHE = "{{nextVersion}}"; + private static final String RSYNC_ACTIONS_PROJECT_DIR = "/rsync-antora-reference/src"; + + private static final String SPRING_DOCS_ACTION_RUNNER = "spring-docs-action-runner.sh"; + + private static final String RUNNER_DESTINATION = RSYNC_ACTIONS_PROJECT_DIR + File.separator + + SPRING_DOCS_ACTION_RUNNER; + public void build(ReleaserProperties properties, ProjectVersion originalVersion, ProjectVersion versionFromReleaseTrain) { build(properties, originalVersion, versionFromReleaseTrain, properties.getWorkingDir()); @@ -96,6 +104,19 @@ public class ProjectCommandExecutor { } } + public void runAntora(ReleaserProperties properties, ProjectVersion originalVersion, + ProjectVersion versionFromReleaseTrain, String projectRoot) { + try { + String command = new CommandPicker(properties, projectRoot).runAntoraCommand(versionFromReleaseTrain); + String[] commands = replaceAllPlaceHolders(originalVersion, versionFromReleaseTrain, command).split(" "); + runCommand(properties, projectRoot, commands); + } + catch (Exception e) { + String message = properties + "\n" + originalVersion + "\n" + versionFromReleaseTrain + "\n" + projectRoot; + throw new IllegalStateException(message, e); + } + } + public void generateReleaseTrainDocs(ReleaserProperties properties, String version, String projectRoot) { try { String updatedCommand = new CommandPicker(properties, projectRoot) @@ -166,6 +187,35 @@ public class ProjectCommandExecutor { return new ReleaserProcessExecutor(workDir); } + public void publishAntoraDocs(File antoraDocsProject, File project, ReleaserProperties properties) { + try { + copyRunnerToActions(antoraDocsProject); + 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("{{host-key}}")) { + commands[i] = commands[i].replace("{{host-key}}", + "\"" + properties.getAntora().getSpringDocsSshHostKey()) + "\""; + } + } + runCommand(properties, antoraDocsProject.getAbsolutePath() + RSYNC_ACTIONS_PROJECT_DIR, commands); + } + catch (Exception e) { + throw new IllegalStateException(e); + } + } + + public void copyRunnerToActions(File antoraDocsProject) throws IOException { + File destination = new File(antoraDocsProject.getAbsolutePath() + RUNNER_DESTINATION); + if (!destination.exists()) { + ClassPathResource runner = new ClassPathResource(SPRING_DOCS_ACTION_RUNNER); + Files.copy(runner.getInputStream(), destination.toPath()); + destination.setExecutable(true); + } + } + public void publishDocs(ReleaserProperties properties, ProjectVersion originalVersion, ProjectVersion changedVersion) { try { @@ -307,6 +357,27 @@ class CommandPicker { return bashCommandWithSystemProps(releaserProperties.getBash().getBuildCommand()); } + String runAntoraCommand(ProjectVersion version) { + if (projectType == ProjectType.GRADLE) { + return gradleCommandWithSystemProps(releaserProperties.getGradle().getRunAntoraCommand()); + } + return mavenCommandWithSystemProps(releaserProperties.getMaven().getRunAntoraCommand(), version); + } + + String publishAntoraDocsCommand(File project, ReleaserProperties properties) { + ProjectVersion version = new ProjectVersion(project); + String repo = properties.getGit().getOrgName() + "/" + version.projectName; + String command = properties.getAntora().getSyncAntoraDocsCommand().replace("{{github-repo}}", repo) + .replace("{{site-path}}", project.getAbsolutePath() + "/target/antora/site"); + if (StringUtils.hasText(properties.getAntora().getSpringDocsSshUsername())) { + command = command.replace("{{ssh-username}}", properties.getAntora().getSpringDocsSshUsername()); + } + if (StringUtils.hasText(properties.getAntora().getSpringDocsSshKeyPath())) { + command = command.replace("{{ssh-key-path}}", properties.getAntora().getSpringDocsSshKeyPath()); + } + return command; + } + String version() { // makes more sense to use PomReader if (projectType == ProjectType.GRADLE) { diff --git a/releaser-core/src/main/resources/spring-docs-action-runner.sh b/releaser-core/src/main/resources/spring-docs-action-runner.sh new file mode 100755 index 00000000..47dde0d3 --- /dev/null +++ b/releaser-core/src/main/resources/spring-docs-action-runner.sh @@ -0,0 +1,122 @@ +#!/bin/bash +set -e +set -f + +# Get the current directory +current_dir=$(pwd) + +# Add the current directory to the PATH variable +export PATH=$PATH:$current_dir + +__action_usage() { + echo "usage: action.sh [OPTION]... + + --docs-username=USERNAME the username used to connect to ssh + --docs-host=HOST the host to connect to ssh + --docs-ssh-key-path=KEY the path to the private key used to connect to ssh + --docs-ssh-host-key=HOST_KEY the host key used to connect to ssh + --dry-run signals that rsync should be in dry run mode + --site-path=PATH the local directory path to sync to the server. Default build/site + --github-repository=GH_REPO the github repository (e.g. spring-projects/spring-security) + --httpdocs-path=PATH the optional base httpdocs path (e.g. https://docs.spring.io/spring-security/reference would be /spring-security/reference) + If this is set, then the project must own the directory by ensuring to have a .github-repository file with the + / as the content. The default is to use /\${REPOSITORY_NAME}/reference + from --github-repository +" +} + +__action_usage_error() { + echo "Error: $1" >&2 + __action_usage + exit 1 +} + +__action() { + local docs_username docs_host docs_ssh_key docs_ssh_host_key site_path github_repository httpdocs_path valid_args + local rsync_flag_options='' + if [ ! -z "$BUILD_REFNAME" ]; then + rsync_flag_options="${rsync_flag_options} --build-ref-name $BUILD_REFNAME" + fi + valid_args=$(getopt --options '' --long docs-username:,docs-host:,docs-ssh-key-path:,docs-ssh-host-key:,dry-run,site-path:,github-repository:,httpdocs-path: -- "$@") + if [[ $? -ne 0 ]]; then + __action_usage + exit 1; + fi + + eval set -- "$valid_args" + + while [ : ]; do + case "$1" in + --docs-username) + docs_username="$2" + shift 2 + ;; + --docs-host) + docs_host="$2" + shift 2 + ;; + --docs-ssh-key-path) + docs_ssh_key=$(cat "$2") + shift 2 + ;; + --docs-ssh-host-key) + docs_ssh_host_key="$2" + shift 2 + ;; + --dry-run) + rsync_flag_options="${rsync_flag_options} --dry-run" + shift + ;; + --site-path) + site_path="$2" + shift 2 + ;; + --github-repository) + github_repository="$2" + shift 2 + ;; + --httpdocs-path) + httpdocs_path="$2" + shift 2 + ;; + --) shift; + break + ;; + *) + __action_usage_error "Invalid argument $1 $2" + ;; + esac + done + + if [ -z "$docs_username" ]; then + __action_usage_error "Missing option '--docs-username'" + fi + if [ -z "$docs_host" ]; then + __action_usage_error "Missing option '--docs-host'" + fi + if [ -z "$docs_ssh_key" ]; then + __action_usage_error "Missing option '--docs-ssh-key'" + fi + if [ -z "$docs_ssh_host_key" ]; then + __action_usage_error "Missing option '--docs-ssh-host-key'" + fi + if [ -z "$site_path" ]; then + site_path="build/site" + fi + if [ -z "$github_repository" ]; then + __action_usage_error "Missing option '--github-repository'" + fi + + ( + set -e + set -f + + action.sh --docs-username "$docs_username" --docs-host "$docs_host" --docs-ssh-key "$docs_ssh_key" --docs-ssh-host-key "$docs_ssh_host_key" --site-path "$site_path" --github-repository "$github_repository" $rsync_flag_options + ) + exit_code=$? + + + exit $exit_code +} + +__action "$@" diff --git a/releaser-spring/src/main/java/releaser/internal/tasks/release/PublishDocsReleaseTask.java b/releaser-spring/src/main/java/releaser/internal/tasks/release/PublishDocsReleaseTask.java index 76e8b872..17d7a9c8 100644 --- a/releaser-spring/src/main/java/releaser/internal/tasks/release/PublishDocsReleaseTask.java +++ b/releaser-spring/src/main/java/releaser/internal/tasks/release/PublishDocsReleaseTask.java @@ -56,7 +56,10 @@ public class PublishDocsReleaseTask implements ReleaseReleaserTask { @Override public ExecutionResult runTask(Arguments args) { - return this.releaser.publishDocs(args.properties, args.originalVersion, args.versionFromBom); + if (this.releaser.buildAntoraDocs(args.project).isSuccess()) { + return this.releaser.publishDocs(args.properties, args.project); + } + return ExecutionResult.failure(new RuntimeException("Failed to build Antora docs")); } @Override diff --git a/releaser-test/src/main/java/releaser/internal/buildsystem/TestUtils.java b/releaser-test/src/main/java/releaser/internal/buildsystem/TestUtils.java index e1a66c5f..ca2b3007 100644 --- a/releaser-test/src/main/java/releaser/internal/buildsystem/TestUtils.java +++ b/releaser-test/src/main/java/releaser/internal/buildsystem/TestUtils.java @@ -35,6 +35,7 @@ public final class TestUtils { prepareLocalRepo("target/test-classes/projects/", "spring-cloud-consul"); prepareLocalRepo("target/test-classes/projects/", "spring-cloud-build"); prepareLocalRepo("target/test-classes/projects/", "spring-cloud-static-angel"); + prepareLocalRepo("target/test-classes/projects/", "spring-docs-actions"); } private static void prepareLocalRepo(String buildDir, String repoPath) throws IOException { diff --git a/releaser-test/src/main/java/releaser/internal/spring/ArgsBuilder.java b/releaser-test/src/main/java/releaser/internal/spring/ArgsBuilder.java index 2ed756dd..78c46f7d 100644 --- a/releaser-test/src/main/java/releaser/internal/spring/ArgsBuilder.java +++ b/releaser-test/src/main/java/releaser/internal/spring/ArgsBuilder.java @@ -39,6 +39,8 @@ public class ArgsBuilder { private final File tempDirAllTestSample; + private File tempDirSpringDocsActions; + List args = new LinkedList<>(); public ArgsBuilder(File project, File tempDirTestSamplesProject, File tempDirReleaseTrainDocs, @@ -58,11 +60,13 @@ public class ArgsBuilder { "releaser.git.documentation-url=" + file("/projects/spring-cloud-static-angel/").toURI(), "releaser.git.test-samples-project-url=" + tempDirTestSamplesProject.getAbsolutePath(), "releaser.git.release-train-docs-url=" + tempDirReleaseTrainDocs.getAbsolutePath(), + "releaser.antora.spring-docs-actions-url=" + file("/projects/spring-docs-actions").toURI(), "releaser.maven.build-command=echo build", "releaser.maven.deploy-command=echo deploy", "releaser.maven.deploy-guides-command=echo guides", "releaser.maven.publish-docs-command=echo docs", "releaser.maven.generate-release-train-docs-command=echo releaseTrainDocs", + "releaser.maven.run-antora-command=echo antora", "releaser.working-dir=" + project.getPath(), "releaser.git.spring-project-url=" + tempDirSpringCloud.getAbsolutePath(), "releaser.git.release-train-wiki-url=" + tmpGitRepo(tempDirReleaseTrainWiki).getAbsolutePath() + "/", From fcfa6caa85246e4444c5c693aa607481781c214d Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Wed, 19 Jun 2024 13:23:16 -0400 Subject: [PATCH 29/33] Updating run antora command to activate docs profile --- .../src/main/java/releaser/internal/ReleaserProperties.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java b/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java index ddea821f..f3898168 100644 --- a/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java +++ b/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java @@ -1116,7 +1116,7 @@ public class ReleaserProperties implements Serializable { /** * Command to be executed to run Antora. */ - private String runAntoraCommand = "./mvnw antora {{systemProps}}"; + private String runAntoraCommand = "./mvnw antora -Pdocs {{systemProps}}"; /** * Additional system properties that should be passed to the build / deploy From 4627d730244c8d123efb39e8ee9ac42f26b8d565 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Wed, 19 Jun 2024 14:31:24 -0400 Subject: [PATCH 30/33] Logging exit code --- releaser-core/src/main/resources/spring-docs-action-runner.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/releaser-core/src/main/resources/spring-docs-action-runner.sh b/releaser-core/src/main/resources/spring-docs-action-runner.sh index 47dde0d3..658d89c8 100755 --- a/releaser-core/src/main/resources/spring-docs-action-runner.sh +++ b/releaser-core/src/main/resources/spring-docs-action-runner.sh @@ -115,6 +115,7 @@ __action() { ) exit_code=$? + echo "Exiting with code $exit_code" exit $exit_code } From 2b2abd3bd19aa147507e7033554d640f601ce02d Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Wed, 19 Jun 2024 16:19:00 -0400 Subject: [PATCH 31/33] Use test actions repo --- projects/spring-cloud/src/main/resources/application.yml | 4 ++-- .../main/java/releaser/internal/git/ProjectGitHandler.java | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/projects/spring-cloud/src/main/resources/application.yml b/projects/spring-cloud/src/main/resources/application.yml index a62ed817..2191e83e 100644 --- a/projects/spring-cloud/src/main/resources/application.yml +++ b/projects/spring-cloud/src/main/resources/application.yml @@ -102,8 +102,8 @@ releaser: bom-name: spring-cloud # fixed-versions: antora: - spring-docs-actions-url: https://github.com/spring-io/spring-doc-actions - spring-docs-actions-tag: v0.0.16 + spring-docs-actions-url: https://github.com/ryanjbaxter/spring-doc-actions +# spring-docs-actions-tag: v0.0.16 sync-antora-docs-command: "./spring-docs-action-runner.sh --docs-username {{ssh-username}} --docs-ssh-key-path {{ssh-key-path}} --docs-host docs-ip.spring.io --docs-ssh-host-key {{host-key}} --site-path {{site-path}} --github-repository {{github-repo}}" meta-release: enabled: false diff --git a/releaser-core/src/main/java/releaser/internal/git/ProjectGitHandler.java b/releaser-core/src/main/java/releaser/internal/git/ProjectGitHandler.java index 431893cb..618b1ed0 100644 --- a/releaser-core/src/main/java/releaser/internal/git/ProjectGitHandler.java +++ b/releaser-core/src/main/java/releaser/internal/git/ProjectGitHandler.java @@ -136,7 +136,11 @@ public class ProjectGitHandler implements Closeable { public File cloneAndCheckoutSpringDocsActions() { File project = cloneProject(this.properties.getAntora().getSpringDocsActionsUrl()); - checkoutTag(project, this.properties.getAntora().getSpringDocsActionsTag()); + String tag = this.properties.getAntora().getSpringDocsActionsTag(); + if (StringUtils.hasText(tag)) { + log.info("Checking out tag [{}] for project [{}]", tag, project.getAbsolutePath()); + checkoutTag(project, this.properties.getAntora().getSpringDocsActionsTag()); + } return project; } From 082c62ebb8a3a669890a5c903d60eaaa0c1f326a Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Wed, 19 Jun 2024 16:52:28 -0400 Subject: [PATCH 32/33] Using new actions release --- projects/spring-cloud/src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/spring-cloud/src/main/resources/application.yml b/projects/spring-cloud/src/main/resources/application.yml index 2191e83e..8501f626 100644 --- a/projects/spring-cloud/src/main/resources/application.yml +++ b/projects/spring-cloud/src/main/resources/application.yml @@ -102,8 +102,8 @@ releaser: bom-name: spring-cloud # fixed-versions: antora: - spring-docs-actions-url: https://github.com/ryanjbaxter/spring-doc-actions -# spring-docs-actions-tag: v0.0.16 + spring-docs-actions-url: https://github.com/spring-io/spring-doc-actions + spring-docs-actions-tag: v0.0.18 sync-antora-docs-command: "./spring-docs-action-runner.sh --docs-username {{ssh-username}} --docs-ssh-key-path {{ssh-key-path}} --docs-host docs-ip.spring.io --docs-ssh-host-key {{host-key}} --site-path {{site-path}} --github-repository {{github-repo}}" meta-release: enabled: false From 40f9c3594d7ab513375538d85dfa1c9ba1226f4e Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Tue, 25 Jun 2024 12:01:18 -0400 Subject: [PATCH 33/33] Add special case for spring-cloud-release --- .../releaser/internal/project/ProjectCommandExecutor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 504e6167..242fb39c 100644 --- a/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java +++ b/releaser-core/src/main/java/releaser/internal/project/ProjectCommandExecutor.java @@ -366,7 +366,9 @@ class CommandPicker { String publishAntoraDocsCommand(File project, ReleaserProperties properties) { ProjectVersion version = new ProjectVersion(project); - String repo = properties.getGit().getOrgName() + "/" + version.projectName; + // the GitHub project for spring-cloud-starter-build is spring-cloud-release + String projectName = version.projectName.equals("spring-cloud-starter-build") ? "spring-cloud-release" : version.projectName; + String repo = properties.getGit().getOrgName() + "/" + projectName; String command = properties.getAntora().getSyncAntoraDocsCommand().replace("{{github-repo}}", repo) .replace("{{site-path}}", project.getAbsolutePath() + "/target/antora/site"); if (StringUtils.hasText(properties.getAntora().getSpringDocsSshUsername())) {