diff --git a/action.yml b/action.yml index ca92693..5b5af01 100644 --- a/action.yml +++ b/action.yml @@ -84,67 +84,6 @@ inputs: runs: using: "composite" steps: - - name: Fail checks - id: fail-checks - shell: bash - env: - FAIL_ON: ${{ inputs.fail-on }} - run: | - [ "${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" ${{ github.workspace }}/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" ${{ github.workspace }}/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)" ${{ github.workspace }}/ort/scan-report.html >/dev/null; \ - if [ $? -eq 0 ]; \ - then \ - echo "0 unresolved errors/warnings/hints"; \ - else \ - echo "FAIL: report has unresolved errors/warnings/hints"; \ - exit 1; \ - fi; \ - } || echo "Do not fail on report unresolved errors/warnings/hints"; - echo "-----------------------------------------------------------------"; - - name: Create output results directory and ORT_DATA_DIR=/project/.ort/ id: results-dir shell: bash @@ -321,3 +260,65 @@ runs: echo "-----------------------------------------------------------------" ls -lah ${{ github.workspace }}/ort/ echo "-----------------------------------------------------------------" + + - name: Fail checks + id: fail-checks + shell: bash + env: + FAIL_ON: ${{ inputs.fail-on }} + run: | + [ "${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" ${{ github.workspace }}/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" ${{ github.workspace }}/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)" ${{ github.workspace }}/ort/scan-report.html >/dev/null; \ + if [ $? -eq 0 ]; \ + then \ + echo "0 unresolved errors/warnings/hints"; \ + else \ + echo "FAIL: report has unresolved errors/warnings/hints"; \ + exit 1; \ + fi; \ + } || echo "Do not fail on report unresolved errors/warnings/hints"; + echo "-----------------------------------------------------------------"; +