You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2024/04/12 08:31:48 UTC

(logging-parent) branch main updated (7d995f2 -> 9bfd888)

This is an automated email from the ASF dual-hosted git repository.

vy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/logging-parent.git


    from 7d995f2  Add explicit section ID
     new 2dbb6c6  Fix release instructions
     new 9bfd888  Add the missing website build necessary for the release workflow

The 2 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:
 .github/workflows/deploy-release-reusable.yaml     | 38 ++++++++++++++++++++++
 .../ROOT/pages/release-instructions-project.adoc   |  5 +--
 2 files changed, 41 insertions(+), 2 deletions(-)


(logging-parent) 01/02: Fix release instructions

Posted by vy...@apache.org.
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 2dbb6c6c9b3ebefa31d6dad34c1f4ed5310e51ea
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Fri Apr 12 10:23:23 2024 +0200

    Fix release instructions
---
 src/site/antora/modules/ROOT/pages/release-instructions-project.adoc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/site/antora/modules/ROOT/pages/release-instructions-project.adoc b/src/site/antora/modules/ROOT/pages/release-instructions-project.adoc
index 9c58ecc..1981f10 100644
--- a/src/site/antora/modules/ROOT/pages/release-instructions-project.adoc
+++ b/src/site/antora/modules/ROOT/pages/release-instructions-project.adoc
@@ -57,7 +57,7 @@ For instance, `site-project.version` needs to be updated for `logging-parent`.
 +
 [source,bash]
 ----
-./mvnw -N changelog-release
+./mvnw -N -P changelog-release
 ----
 .. Edit the release notes (i.e., `src/changelog/7.8.0/.release-notes.adoc.ftl`)
 
@@ -65,8 +65,9 @@ For instance, `site-project.version` needs to be updated for `logging-parent`.
 +
 [source,bash]
 ----
+git add .
 git commit -a -m 'Prepare to release `7.8.0`'
-git push origin release/7.8.0
+git push -u origin release/7.8.0
 ----
 +
 [TIP]


(logging-parent) 02/02: Add the missing website build necessary for the release workflow

Posted by vy...@apache.org.
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 9bfd88824626d831fff9d3dc05631b94c242bd69
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Fri Apr 12 10:31:38 2024 +0200

    Add the missing website build necessary for the release workflow
---
 .github/workflows/deploy-release-reusable.yaml | 38 ++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/.github/workflows/deploy-release-reusable.yaml b/.github/workflows/deploy-release-reusable.yaml
index 022868c..22adfce 100644
--- a/.github/workflows/deploy-release-reusable.yaml
+++ b/.github/workflows/deploy-release-reusable.yaml
@@ -146,6 +146,44 @@ jobs:
             --show-version --batch-mode --errors --no-transfer-progress \
             -P deploy,release
 
+      # Node.js cache is needed for Antora
+      - name: Set up Node.js cache
+        id: nodejs-cache
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9   # 4.0.2
+        with:
+          # We should be calculating the cache key using `package-lock.json` instead!
+          # See https://stackoverflow.com/a/48524475/1278899
+          # For that, `package-lock.json` needs to be committed into the repository – right now it is `.gitignore`d.
+          # Once it is there, we should ideally switch from `npm i` to `npm ci`.
+          # For that, we need to configure `dependabot` to update hundreds of dependencies listed in `package-lock.json`.
+          # That translates to a never ending rain of `dependabot` PRs.
+          # I doubt if the wasted CPU cycles worth the gain.
+          key: ${{ runner.os }}-nodejs-cache-${{ hashFiles('node', 'node_modules') }}
+          # `actions/cache` doesn't recommend caching `node_modules`.
+          # Though none of its recipes fit our bill, since we install Node.js using `frontend-maven-plugin`.
+          # See https://github.com/actions/cache/blob/main/examples.md#node---npm
+          # We settle for this quick-n-dirty solution for the time being.
+          path: |
+            node
+            node_modules
+
+      # Website build is needed to generate the release notes
+      - name: Build the website
+        shell: bash
+        env:
+          # Making Node.js cache hit visible for debugging purposes
+          NODEJS_CACHE_HIT: ${{ steps.nodejs-cache.outputs.cache-hit }}
+        run: |
+          export TIMESTAMP=$(./mvnw \
+            --non-recursive --quiet --batch-mode \
+            -DforceStdout=true \
+            -Dexpression=project.build.outputTimestamp \
+            help:evaluate \
+            | tail -n 1)
+          ./mvnw \
+            --show-version --batch-mode --errors --no-transfer-progress \
+            site
+
       - name: Stage distribution attachments
         shell: bash
         run: |