You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2022/10/06 13:16:53 UTC
[isis] 11/11: ISIS-2965: updates page-isisrel in site.yml
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 d14d7e80c76269884af44b4283751ee0ea8a53c1
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Oct 6 14:16:26 2022 +0100
ISIS-2965: updates page-isisrel in site.yml
---
.../comguide/modules/ROOT/pages/post-release-successful.adoc | 12 +++++++-----
antora/playbooks/site.yml | 4 ++--
2 files changed, 9 insertions(+), 7 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 87ce349ed3..5bf940b87d 100644
--- a/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/post-release-successful.adoc
@@ -406,16 +406,18 @@ include::partial$publish-and-index-website.adoc[]
Because we release from a branch, the changes made in the branch should be merged back from the release branch back into the `master` branch.
-In the `isis` repo (adjust RC number as required):
+In the `isis` repo ():
[source,bash,subs="attributes+"]
----
-git checkout master # update master with latest
+RC=RC1 <.>
+git checkout master
git pull
-git merge release-{page-isisrel}-RC1 # merge branch onto master
-git push origin --delete release-{page-isisrel}-RC1 # remote branch no longer needed
-git branch -d release-{page-isisrel}-RC1 # branch no longer needed
+git merge release-{page-isisrel}-$RC
+git push origin --delete release-{page-isisrel}-$RC
+git branch -d release-{page-isisrel}-$RC
----
+<.> adjust RC number as required
== Bump \{page-isisrel} in `site.yml`
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index c0c52d93d4..2fe8a252e1 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -310,8 +310,8 @@ asciidoc:
kroki-default-options: interactive # only available for SVG
kroki-fetch-diagram: true
kroki-server-url: https://kroki.io # (default)
- page-isisprev: "2.0.0-M7"
- page-isisrel: "2.0.0-M8"
+ page-isisprev: "2.0.0-M8"
+ page-isisrel: "2.0.0-M9"
output:
dir: antora/target/site