Merge pull request #63982 from aireilly/adjust-validate-script-again

Adjust validate script

Author: gaurav-nelson

.travis.yml

@@ -19,8 +19,9 @@ jobs:
         - gem install asciidoctor asciidoctor-diagram rouge
         - pip3 install pyyaml aura.tar.gz
       script:
-        # Fail if Asciidoctor encounters errors. Pass otherwise. Run only if there are modified AsciiDoc files
-        - if ! [[ -z $(git diff --name-only HEAD~1 HEAD --diff-filter=d '*.adoc' ':(exclude)_unused_topics/*') ]]; then chmod +x ./scripts/check-asciidoctor-build.sh && ./scripts/check-asciidoctor-build.sh; fi
+        # Fail if Asciidoctor encounters errors. Pass otherwise.
+        - chmod +x ./scripts/check-asciidoctor-build.sh
+        - ./scripts/check-asciidoctor-build.sh || travis_terminate 1
 
     - stage: build
       if: branch IN (main, enterprise-4.13, enterprise-4.14)

scripts/check-asciidoctor-build.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -e
-
 # ensure asciidoctor is installed
 if ! command -v asciidoctor &>/dev/null ;
 then
@@ -11,7 +9,6 @@ fi
 
 # get the *.adoc modules and assemblies in the pull request
 FILES=$(git diff --name-only HEAD~1 HEAD --diff-filter=d "*.adoc" ':(exclude)_unused_topics/*')
-
 REPO_PATH=$(git rev-parse --show-toplevel)
 
 # get the modules in the PR, search for assemblies that include them, and concat with any updated assemblies files
@@ -24,8 +21,10 @@ check_updated_assemblies () {
         # Exit 0 if there are no modified assemblies
         if [[ -z "${UPDATED_ASSEMBLIES}" ]]
         then
+            echo "No updated assemblies found! ✅"
             exit 0
         fi
+        update_log
         # subtract $REPO_PATH from path with bash substring replacement
         UPDATED_ASSEMBLIES=${UPDATED_ASSEMBLIES//"$REPO_PATH/"/}
     fi
@@ -42,14 +41,23 @@ check_updated_assemblies () {
         if grep -rq "$PAGE" --include "*.yml" _topic_maps ; then
             # validate the assembly
             echo "Validating $ASSEMBLY ... 🚨"
-            VALIDATION_ERROR=$(asciidoctor "$ASSEMBLY" -a source-highlighter=rouge -a icons! -o /tmp/out.html -v --failure-level WARN --trace)
+            RED='\033[0;31m'
+            NC='\033[0m'
+            OUTPUT=$(asciidoctor "$ASSEMBLY" -a source-highlighter=rouge -a icons! -o /tmp/out.html -v --failure-level WARN --trace 2>&1)
+
             # check assemblies and fail if errors are reported
-            if [[ -z "$VALIDATION_ERROR" ]];
+            if [[ $? != 0 ]];
             then
+                echo -e "${RED}$OUTPUT${NC}"
+                echo "Validation errors found! ❌"
+                exit 1
+            else
                 echo "No errors found! ✅"
+                exit 0
             fi
         else
             echo "$ASSEMBLY is not in a topic_map, skipping validation... 😙"
+            exit 0
         fi
     done
 }
@@ -71,8 +79,8 @@ update_log () {
 # check assemblies and fail if errors are reported
 if [ -n "${FILES}" ] ;
 then
-    update_log
     check_updated_assemblies
 else
     echo "No modified AsciiDoc files found! 🥳"
+    exit 0
 fi