This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git
commit 474c8a1c651941ac54f4cb8e9f5e6264409183d2 Author: Dan Haywood <[email protected]> AuthorDate: Thu Oct 6 14:11:09 2022 +0100 ISIS-2965: improves release process docs --- .../ROOT/pages/post-release-successful.adoc | 51 ++++++++++------------ .../ROOT/partials/publish-and-index-website.adoc | 2 +- 2 files changed, 23 insertions(+), 30 deletions(-) diff --git a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc index 251b91f27b..87ce349ed3 100644 --- a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc +++ b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc @@ -200,61 +200,54 @@ If necessary, checkout this directory structure: svn co https://dist.apache.org/repos/dist/release/isis isis-dist ---- -Next, add the new release into the appropriate directory, and delete any previous release. +Next, add the new release into the appropriate directory. The `upd.sh` script can be used to automate this: [source,bash] ---- -old_ver=$1 -new_ver=$2 +new_ver=$1 +if [ $# -lt 1 ]; then + echo "usage: $(basename $0) version" 2>&1 + exit 1 +fi # constants +fullname="isis-bom" repo_root=https://repository.apache.org/content/repositories/releases/org/apache/isis +# file suffices zip="source-release.zip" asc="$zip.asc" md5="$zip.md5" +sha1="$zip.sha1" sha512="$zip.sha512" - -fullname="isis-bom" -pushd bom - -curl -O $repo_root/$fullname/$new_ver/$fullname-$new_ver-$asc -svn add $fullname-$new_ver-$asc -curl -O $repo_root/$fullname/$new_ver/$fullname-$new_ver-$md5 -svn add $fullname-$new_ver-$md5 -curl -O $repo_root/$fullname/$new_ver/$fullname-$new_ver-$zip -svn add $fullname-$new_ver-$zip -curl -O $repo_root/$fullname/$new_ver/$fullname-$new_ver-$zip -svn add $fullname-$new_ver-$sha512 - -if [ "Z${old_ver}Z" == "ZZ" ]; then - echo "old_ver not specified, so nothing will be removed" -else - svn delete $fullname-$old_ver-$asc - svn delete $fullname-$old_ver-$md5 - svn delete $fullname-$old_ver-$zip - svn delete $fullname-$old_ver-$sha512 -fi - -popd +for suffix in $zip $asc $md5 $sha1 $sha512 +do + echo curl -O $repo_root/$fullname/$new_ver/$fullname-$new_ver-$suffix + curl -O $repo_root/$fullname/$new_ver/$fullname-$new_ver-$suffix + svn add $fullname-$new_ver-$suffix +done ---- [source,bash,subs="attributes+"] ---- -sh upd.sh [previous_release] {page-isisrel} +sh upd.sh{page-isisrel} ---- -The script downloads the artifacts from the Nexus release repository, adds the artifacts to subversion and deletes the previous version. +The script downloads the artifacts from the Nexus release repository and adds the artifacts to subversion. + +Manually delete any old files using `svn delete`. Double check that the files are correct; there is sometimes a small delay in the files becoming available in the release repository. It should be sufficient to check just the `md5` or `.asc` files that these look valid (aren't HTML 404 error pages): [source,bash,subs="attributes+"] ---- -vi `find . -name *.md5` +cat *.md5 +cat *.sha1 +cat *.sha512 ---- Assuming all is good, commit the changes: diff --git a/antora/components/comguide/modules/ROOT/partials/publish-and-index-website.adoc b/antora/components/comguide/modules/ROOT/partials/publish-and-index-website.adoc index 80dee33248..2087920bb3 100644 --- a/antora/components/comguide/modules/ROOT/partials/publish-and-index-website.adoc +++ b/antora/components/comguide/modules/ROOT/partials/publish-and-index-website.adoc @@ -74,7 +74,7 @@ We use the Algolia-provided link:https://hub.docker.com/r/algolia/docsearch-scra [source,bash] ---- cd content -docker run -it --env-file=../algolia.env -e "CONFIG=$(cat ../algolia-config.json | jq -r tostring)" algolia/docsearch-scraper +docker run -it --env-file=../algolia.env -e "CONFIG=$(cat ../algolia-config.json | jq -r tostring)" algolia/docsearch-scraper:v1.16.0 ---- This posts the index up to the link:https://algolia.com[Algolia] site.
