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 2021/04/04 12:26:48 UTC
[isis] branch master updated (7025929 -> 3efc8bc)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 7025929 Merge branch '2.0.0-M5'
add 2496425 minor tweaks to jdo and jpa config guide
new faa2ddc Merge branch '2.0.0-M5'
add 4b126a1 ISIS-2484: adds docs on setting up other EclipseLink config props
new b934b7a ISIS-2484: improves website update docs
new 3efc8bc Merge branch '2.0.0-M5'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../ROOT/partials/publish-and-index-website.adoc | 28 ++++++++++++----------
.../ROOT/pages/setup-and-configuration.adoc | 3 +++
.../ROOT/pages/setup-and-configuration.adoc | 24 +++++++++++++++++--
3 files changed, 40 insertions(+), 15 deletions(-)
[isis] 01/03: Merge branch '2.0.0-M5'
Posted by da...@apache.org.
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 faa2ddc430fad9cc5d097c88768c7bd1cd054c1a
Merge: 7025929 2496425
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Apr 4 08:08:45 2021 +0100
Merge branch '2.0.0-M5'
persistence/jdo/adoc/modules/ROOT/pages/setup-and-configuration.adoc | 3 +++
persistence/jpa/adoc/modules/ROOT/pages/setup-and-configuration.adoc | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
[isis] 02/03: ISIS-2484: improves website update docs
Posted by da...@apache.org.
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 b934b7a56a138dc492f92c0da4fe50c27a54e6ca
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Apr 4 11:43:56 2021 +0100
ISIS-2484: improves website update docs
---
.../ROOT/partials/publish-and-index-website.adoc | 28 ++++++++++++----------
1 file changed, 15 insertions(+), 13 deletions(-)
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 89bcb8b..80dee33 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
@@ -13,35 +13,37 @@ git checkout asf-site
git pull --ff-only
----
-* still in the `isis-site` repo, delete all the files in `content/` _except_ for the `schema` and `versions` directories:
+* still in the `isis-site` repo, run the `copyover.sh` script:
+
[source,bash,subs="attributes+"]
----
+sh copyover.sh
+----
++
+This deletes all the files in `content/` _except_ for the `schema` and `versions` directories, and copies the generated Antora site to `isis-site` repo's `contents` directory:
++
+[source,bash,subs="attributes+"]
+----
+#!/usr/bin/env bash
pushd content
for a in $(ls -1 | grep -v schema | grep -v versions)
do
rm -rf $a
done
popd
-----
-
-* Copy the generated Antora site to `isis-site` repo's `contents` directory:
-+
-[source,bash,subs="attributes+"]
-----
-cd ../isis
+pushd ../isis
cp -Rf antora/target/site/* ../isis-site/content/.
+popd
+
+git add .
----
-* Back in the `isis-site` repo, commit the changes and preview:
+* Commit the changes and preview:
+
[source,bash,subs="attributes+"]
----
-cd ../isis-site
-
-git add .
-git commit -m "$ISISJIRA : production changes to website"
+git commit -m "updates website"
sh preview.sh
----
[isis] 03/03: Merge branch '2.0.0-M5'
Posted by da...@apache.org.
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 3efc8bc82eea3747def037f794f032052049da39
Merge: faa2ddc b934b7a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Apr 4 11:47:05 2021 +0100
Merge branch '2.0.0-M5'
.../ROOT/partials/publish-and-index-website.adoc | 28 ++++++++++++----------
.../ROOT/pages/setup-and-configuration.adoc | 19 +++++++++++++++
2 files changed, 34 insertions(+), 13 deletions(-)