adding back other cases

edulix · Nov 22, 2021 · 4bf8d3b · 4bf8d3b
1 parent cfbecae
commit 4bf8d3b
Showing 1 changed file with 32 additions and 0 deletions.
diff --git a/action.yml b/action.yml
@@ -270,16 +270,48 @@ runs:
         [ "${FAIL_ON}" = "dont-fail" ] && \
           { echo "do not need to fail on unresolved issues so don't perform this step"; exit 0; };
         
+        
         echo "-----------------------------------------------------------------"
         echo " ORT fail checks step"
         echo "-----------------------------------------------------------------"
         echo " Inputs: "
         echo "    FAIL_ON : '${FAIL_ON}' "
         echo "-----------------------------------------------------------------"
         
+        [ "${FAIL_ON}" = "errors" ] && { \
+        echo " Checking unresolved errors"; \
+        echo "-----------------------------------------------------------------"; \
+        grep "Rule Violation Summary (0 errors" $A/ort/scan-report.html >/dev/null; \
+        export FAILED_EXEC=$?; \
+        if [ $FAILED_EXEC -eq 0 ]; \
+        then \
+          echo "0 unresolved errors"; \
+        else; \
+          echo "FAIL: report has unresolved errors"; \
+          exit 1; \
+        fi; \
+        } || echo "Do not fail on report unresolved errors"; 
+        echo "-----------------------------------------------------------------";
+
+        [ "${FAIL_ON}" = "warnings" ] && { \
+        echo " Checking unresolved errors/warnings"; \
+        echo "-----------------------------------------------------------------"; \
+        grep "Rule Violation Summary (0 errors, 0 warnings" $A/ort/scan-report.html >/dev/null; \
+        export FAILED_EXEC=$?; \
+        if [ $FAILED_EXEC -eq 0 ]; \
+        then \
+          echo "0 unresolved errors/warnings"; \
+        else; \
+          echo "FAIL: report has unresolved errors/warnings"; \
+          exit 1; \
+        fi; \
+        } || echo "Do not fail on report unresolved errors/warnings"; 
+        echo "-----------------------------------------------------------------";
+        
         [ "${FAIL_ON}" = "hints" ] && { \
         echo " Checking unresolved errors/warnings/hints"; \
         echo "-----------------------------------------------------------------"; \
+        grep "Rule Violation Summary (0 errors, 0 warnings, 0 hints to resolve)" $A/ort/scan-report.html >/dev/null; \
         export FAILED_EXEC=$?; \
         if [ $FAILED_EXEC -eq 0 ]; \
         then \