This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit a9fc596d9300d46e2a0384b3bfba72144e779b37 Author: Volkan Yazıcı <[email protected]> AuthorDate: Tue Oct 10 09:22:12 2023 +0200 Fix website release instructions --- src/site/_constants.adoc | 4 ++-- src/site/_constants.tmpl.adoc | 4 ++-- src/site/_release-instructions.adoc | 21 ++++++++++----------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/site/_constants.adoc b/src/site/_constants.adoc index 6d6312a..5b7f801 100644 --- a/src/site/_constants.adoc +++ b/src/site/_constants.adoc @@ -39,8 +39,8 @@ :project-id: logging-parent :java-target-version: 8 :java-compiler-version: [17,18) -:website-github-repository-name: logging-site +:website-github-repository-name: logging-parent :website-github-url: https://github.com/apache/{website-github-repository-name} -:website-folder: {project-id} +:website-folder: :website-url-staging: https://logging.staged.apache.org/{project-id} :website-url: https://logging.apache.org/{project-id} diff --git a/src/site/_constants.tmpl.adoc b/src/site/_constants.tmpl.adoc index 90884ff..550644b 100644 --- a/src/site/_constants.tmpl.adoc +++ b/src/site/_constants.tmpl.adoc @@ -39,8 +39,8 @@ :project-id: logging-parent :java-target-version: ${maven.compiler.target} :java-compiler-version: ${minimalJavaBuildVersion} -:website-github-repository-name: logging-site +:website-github-repository-name: logging-parent :website-github-url: https://github.com/apache/{website-github-repository-name} -:website-folder: {project-id} +:website-folder: :website-url-staging: https://logging.staged.apache.org/{project-id} :website-url: https://logging.apache.org/{project-id} diff --git a/src/site/_release-instructions.adoc b/src/site/_release-instructions.adoc index 02e9c59..2f49151 100644 --- a/src/site/_release-instructions.adoc +++ b/src/site/_release-instructions.adoc @@ -67,8 +67,7 @@ If not, commit necessary fixes, push, and repeat. === Stage the release website . Checkout the `asf-staging` branch of {website-github-url}[the website repository] -. Browse to the `{website-folder}` folder -. Override the contents of the `7.x` folder using the website uploaded to the https://dist.apache.org/repos/dist/dev/logging/{project-id}[dist.apache.org/repos/dist/**dev**/logging/{project-id}] Subversion repository +. Override the contents of the `{website-folder}7.x` folder using the website uploaded to the https://dist.apache.org/repos/dist/dev/logging/{project-id}[dist.apache.org/repos/dist/**dev**/logging/{project-id}] Subversion repository These steps can be summarized as follows in shell: @@ -83,10 +82,10 @@ cd {website-github-repository-name} git checkout -B asf-staging origin/asf-staging # Override the website -git rm -rf {website-folder}/7.x -mkdir {website-folder}/7.x -unzip ../logging-dist-dev/{project-id}/*-7.8.0-site.zip -d {website-folder}/7.x -git add {website-folder}/7.x +git rm -rf {website-folder}7.x +mkdir {website-folder}7.x +unzip ../logging-dist-dev/{project-id}/*-7.8.0-site.zip -d {website-folder}7.x +git add {website-folder}7.x git commit -a -m 'Add `{project-id}` version `7.8.0` website' git push origin asf-staging ---- @@ -211,7 +210,7 @@ svn commit -m 'Remove `{project-id}` version `7.8.0` files released' === Publish the release website . Checkout the `asf-site` branch of {website-github-url}[the website repository] -. Replace the `{website-folder}/7.x` folder with the one in `asf-staging` branch +. Replace the `{website-folder}7.x` folder with the one in `asf-staging` branch These steps can be summarized as follows in shell: @@ -225,10 +224,10 @@ cd {website-github-repository-name} git checkout -B asf-site origin/asf-site # Override the website -git rm -rf {website-folder}/7.x -mkdir {website-folder}/7.x -git checkout asf-staging -- {website-folder}/7.x -git add {website-folder}/7.x +git rm -rf {website-folder}7.x +mkdir {website-folder}7.x +git checkout asf-staging -- {website-folder}7.x +git add {website-folder}7.x git commit -a -m 'Add `{project-id}` version `7.8.0` website' git push origin asf-site ----
