You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gi...@apache.org on 2024/04/12 11:18:39 UTC
(logging-parent) branch main-site-stg-out updated: Add website content generated from `5c931fbbc60bd54bcd0c5ef2fb475dd4025ba4b8`
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main-site-stg-out
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
The following commit(s) were added to refs/heads/main-site-stg-out by this push:
new c0c19b2 Add website content generated from `5c931fbbc60bd54bcd0c5ef2fb475dd4025ba4b8`
c0c19b2 is described below
commit c0c19b23527173512dbc3ca7da22a2e2f6d1950c
Author: ASF Logging Services RM <pr...@logging.apache.org>
AuthorDate: Fri Apr 12 11:18:35 2024 +0000
Add website content generated from `5c931fbbc60bd54bcd0c5ef2fb475dd4025ba4b8`
---
release-instructions-project.html | 16 ++++++++--------
sitemap.xml | 12 ++++++------
usage.html | 25 ++++++++++++++++++++++---
3 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/release-instructions-project.html b/release-instructions-project.html
index dc96b84..38aeed1 100644
--- a/release-instructions-project.html
+++ b/release-instructions-project.html
@@ -342,14 +342,6 @@ git push --delete origin release/7.8.0</code></pre>
</div>
</div>
</li>
-<li>
-<p>Delete the release staging website branch:</p>
-<div class="listingblock">
-<div class="content">
-<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git push --delete origin release/7.8.0-site-stg-out</code></pre>
-</div>
-</div>
-</li>
</ol>
</div>
</div>
@@ -459,6 +451,14 @@ git push origin main-site-pro</code></pre>
<li>
<p>Verify that <a href="https://logging.apache.org/logging-parent">the project website</a> is updated</p>
</li>
+<li>
+<p>Delete the release staging website branch:</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">git push --delete origin release/7.8.0-site-stg-out</code></pre>
+</div>
+</div>
+</li>
</ol>
</div>
</div>
diff --git a/sitemap.xml b/sitemap.xml
index c7ae801..ae7492f 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -2,26 +2,26 @@
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>https://logging.apache.org/logging-parent/features.html</loc>
-<lastmod>2024-04-12T10:58:37.903Z</lastmod>
+<lastmod>2024-04-12T11:18:33.664Z</lastmod>
</url>
<url>
<loc>https://logging.apache.org/logging-parent/index.html</loc>
-<lastmod>2024-04-12T10:58:37.903Z</lastmod>
+<lastmod>2024-04-12T11:18:33.664Z</lastmod>
</url>
<url>
<loc>https://logging.apache.org/logging-parent/release-instructions-project.html</loc>
-<lastmod>2024-04-12T10:58:37.903Z</lastmod>
+<lastmod>2024-04-12T11:18:33.664Z</lastmod>
</url>
<url>
<loc>https://logging.apache.org/logging-parent/release-instructions-xml-schema.html</loc>
-<lastmod>2024-04-12T10:58:37.903Z</lastmod>
+<lastmod>2024-04-12T11:18:33.664Z</lastmod>
</url>
<url>
<loc>https://logging.apache.org/logging-parent/release-notes.html</loc>
-<lastmod>2024-04-12T10:58:37.903Z</lastmod>
+<lastmod>2024-04-12T11:18:33.664Z</lastmod>
</url>
<url>
<loc>https://logging.apache.org/logging-parent/usage.html</loc>
-<lastmod>2024-04-12T10:58:37.903Z</lastmod>
+<lastmod>2024-04-12T11:18:33.664Z</lastmod>
</url>
</urlset>
diff --git a/usage.html b/usage.html
index 842f580..88d47f5 100644
--- a/usage.html
+++ b/usage.html
@@ -170,8 +170,20 @@
<h2 id="website"><a class="anchor" href="#website"></a>Website deployment</h2>
<div class="sectionbody">
<div class="paragraph">
-<p>Using <code>deploy-site-reusable.yaml</code> reusable GitHub Actions workflow, you can automate the website deployments for staging and production environments.
-See how <a href="https://github.com/apache/logging-parent/blob/main/.github/workflows/deploy-site.yaml"><code>deploy-site.yaml</code> of Logging Parent</a> achieves that using the following repository branching scheme:</p>
+<p>Using <code>deploy-site-reusable.yaml</code> reusable GitHub Actions workflow, you can automate the website deployments for staging and production environments.</p>
+</div>
+<div class="sect2">
+<h3 id="website-logging-parent"><a class="anchor" href="#website-logging-parent"></a>Example: Logging Parent branching scheme</h3>
+<div class="paragraph">
+<p>See how <a href="https://github.com/apache/logging-parent/blob/main/.github/workflows/deploy-site.yaml"><code>deploy-site.yaml</code> of Logging Parent</a> achieves that using the</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlightjs highlight"><code class="language-none hljs"><source-branch>-site-<environment>-out</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>branch naming convention:</p>
</div>
<div class="dlist">
<dl>
@@ -234,8 +246,10 @@ In short, CI builds <code>release/<version></code> and copies the generate
</dd>
</dl>
</div>
+<div class="sect3">
+<h4 id="website-logging-parent-rationale"><a class="anchor" href="#website-logging-parent-rationale"></a>Rationale</h4>
<div class="paragraph">
-<p>Note that this branching scheme allows to</p>
+<p>This branching scheme allows to</p>
</div>
<div class="ulist">
<ul>
@@ -247,6 +261,10 @@ In short, CI builds <code>release/<version></code> and copies the generate
</li>
</ul>
</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="website-log4j"><a class="anchor" href="#website-log4j"></a>Example: Log4j website branching scheme</h3>
<div class="paragraph">
<p>For instance, the following branching scheme is used for the Log4j project:</p>
</div>
@@ -298,6 +316,7 @@ In short, CI builds <code>release/<version></code> and copies the generate
</table>
</div>
</div>
+</div>
</article>
</div>
</main>