[causeway] branch master updated: CAUSEWAY-2445: attempted CI build fix (antora run issue 5)

[ah...@apache.org]

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

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git


The following commit(s) were added to refs/heads/master by this push:
     new a40f3f7edd CAUSEWAY-2445: attempted CI build fix (antora run issue 5)
a40f3f7edd is described below

commit a40f3f7edde65a8a4a372fd532d4966d413e1f38
Author: andi-huber <ah...@apache.org>
AuthorDate: Sun Feb 19 16:16:28 2023 +0100

    CAUSEWAY-2445: attempted CI build fix (antora run issue 5)
---
 scripts/ci/_adoc-antora.sh | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/scripts/ci/_adoc-antora.sh b/scripts/ci/_adoc-antora.sh
index 0d00cc36dc..1617ec905f 100644
--- a/scripts/ci/_adoc-antora.sh
+++ b/scripts/ci/_adoc-antora.sh
@@ -48,19 +48,17 @@ if [ -z "$REVISION" ]; then
   export REVISION="SNAPSHOT"
 fi
 
-#if [ -z "$ANTORA_CMD" ]; then
-#  ANTORA_CMD=$(command -v antora 2>/dev/null)
-#  if [ -z "$ANTORA_CMD" ]; then
-#    ANTORA_CMD=$(npm bin)/antora
-#  fi
-#  if [ -z "$ANTORA_CMD" ]; then
-#    ANTORA_CMD=npm run antora
-#  fi
-#fi
+if [ -z "$ANTORA_CMD" ]; then
+  ANTORA_CMD=$(command -v antora 2>/dev/null)
+  if [ -z "$ANTORA_CMD" ]; then
+#    ANTORA_CMD=$(npm bin)/antora #fails with unknown command 'bin' on ubuntu ... our CI build env
+    ANTORA_CMD="npx antora"
+  fi
+fi
 
 echo "running antora ..."
 echo "$ANTORA_CMD --redirect-facility static --stacktrace $PLAYBOOK"
-npx antora --redirect-facility static --stacktrace $PLAYBOOK
+$ANTORA_CMD --redirect-facility static --stacktrace $PLAYBOOK
 
 # clean up
 rm $PLAYBOOK