fix(action): Run Evaluator after Advisor

Policy rules for security vulnerabilities do not work as expected
prior to this change as the Evaluator is executed before the Advisor
e.g. rules are checked before known vulnerabilities for packages are retrieved.

Signed-off-by: Thomas Steenbergen <[email protected]>

Author: tsteenbe

action.yml

@@ -454,12 +454,14 @@ runs:
         [[ -f $ORT_RESULTS_SCANNER_PATH ]] && \
           ln -frs $ORT_RESULTS_SCANNER_PATH $ORT_RESULTS_CURRENT_PATH || \
           echo -e "\e[1;31m File $ORT_RESULTS_SCANNER_PATH not found."
-    - name: Run ORT Evaluator
-      id: ort-evaluator
+    - name: Run ORT Advisor
+      id: ort-advisor
       shell: bash
-      if: contains(inputs.run, 'evaluator')
+      if: contains(inputs.run, 'advisor')
+      env:
+        ORT_ADVISORS: ${{ inputs.advisors }}
       run: |
-        echo -e "\e[1;33m Running ORT Evaluator... "
+        echo -e "\e[1;33m Running ORT Advisor... "
         docker run \
         --mount type=bind,source=$HOME,target=/home/ort \
         -e JDK_JAVA_OPTIONS="--illegal-access=warn -Xmx5120m" \
@@ -469,25 +471,24 @@ runs:
         $ORT_DOCKER_IMAGE \
         --$ORT_LOG_LEVEL \
         $ORT_CLI_ARGS \
-        evaluate \
+        advise \
         -i ${ORT_RESULTS_CURRENT_PATH/$USER/ort} \
         -o ${ORT_RESULTS_PATH/$USER/ort} \
+        -a $ORT_ADVISORS \
         -f JSON \
-        ${ORT_CLI_EVALUATE_ARGS} || ORT_CLI_EVALUATE_EXIT_CODE=$? \
-        && export ORT_CLI_EVALUATE_EXIT_CODE="${ORT_CLI_EVALUATE_EXIT_CODE:-0}" \
+        ${ORT_CLI_ADVISE_ARGS} || ORT_CLI_ADVISE_EXIT_CODE=$? \
+        && export ORT_CLI_ADVISE_EXIT_CODE="${ORT_CLI_ADVISE_EXIT_CODE:-0}" \
         && printenv >> "$GITHUB_ENV"
-        [[ -f $ORT_RESULTS_EVALUATOR_PATH ]] && \
-          ln -frs $ORT_RESULTS_EVALUATOR_PATH $ORT_RESULTS_CURRENT_PATH || \
-          echo -e "\e[1;31m File $ORT_RESULTS_EVALUATOR_PATH not found."
-        [[ $ORT_CLI_EVALUATE_EXIT_CODE -ne 2 ]] && exit ${ORT_CLI_EVALUATE_EXIT_CODE} || exit 0
-    - name: Run ORT Advisor
-      id: ort-advisor
+        [[ -f $ORT_RESULTS_ADVISOR_PATH ]] && \
+          ln -frs $ORT_RESULTS_ADVISOR_PATH $ORT_RESULTS_CURRENT_PATH || \
+          echo -e "\e[1;31m File $ORT_RESULTS_ADVISOR_PATH not found."
+        [[ $ORT_CLI_ADVISE_EXIT_CODE -ne 2 ]] && exit ${ORT_CLI_ADVISE_EXIT_CODE} || exit 0
+    - name: Run ORT Evaluator
+      id: ort-evaluator
       shell: bash
-      if: contains(inputs.run, 'advisor')
-      env:
-        ORT_ADVISORS: ${{ inputs.advisors }}
+      if: contains(inputs.run, 'evaluator')
       run: |
-        echo -e "\e[1;33m Running ORT Advisor... "
+        echo -e "\e[1;33m Running ORT Evaluator... "
         docker run \
         --mount type=bind,source=$HOME,target=/home/ort \
         -e JDK_JAVA_OPTIONS="--illegal-access=warn -Xmx5120m" \
@@ -497,18 +498,17 @@ runs:
         $ORT_DOCKER_IMAGE \
         --$ORT_LOG_LEVEL \
         $ORT_CLI_ARGS \
-        advise \
+        evaluate \
         -i ${ORT_RESULTS_CURRENT_PATH/$USER/ort} \
         -o ${ORT_RESULTS_PATH/$USER/ort} \
-        -a $ORT_ADVISORS \
         -f JSON \
-        ${ORT_CLI_ADVISE_ARGS} || ORT_CLI_ADVISE_EXIT_CODE=$? \
-        && export ORT_CLI_ADVISE_EXIT_CODE="${ORT_CLI_ADVISE_EXIT_CODE:-0}" \
+        ${ORT_CLI_EVALUATE_ARGS} || ORT_CLI_EVALUATE_EXIT_CODE=$? \
+        && export ORT_CLI_EVALUATE_EXIT_CODE="${ORT_CLI_EVALUATE_EXIT_CODE:-0}" \
         && printenv >> "$GITHUB_ENV"
-        [[ -f $ORT_RESULTS_ADVISOR_PATH ]] && \
-          ln -frs $ORT_RESULTS_ADVISOR_PATH $ORT_RESULTS_CURRENT_PATH || \
-          echo -e "\e[1;31m File $ORT_RESULTS_ADVISOR_PATH not found."
-        [[ $ORT_CLI_ADVISE_EXIT_CODE -ne 2 ]] && exit ${ORT_CLI_ADVISE_EXIT_CODE} || exit 0
+        [[ -f $ORT_RESULTS_EVALUATOR_PATH ]] && \
+          ln -frs $ORT_RESULTS_EVALUATOR_PATH $ORT_RESULTS_CURRENT_PATH || \
+          echo -e "\e[1;31m File $ORT_RESULTS_EVALUATOR_PATH not found."
+        [[ $ORT_CLI_EVALUATE_EXIT_CODE -ne 2 ]] && exit ${ORT_CLI_EVALUATE_EXIT_CODE} || exit 0
     - name: Run ORT Reporter
       id: ort-reporter
       shell: bash