inverse the order

SolaceDev · Nov 27, 2024 · 234c84a · 234c84a
1 parent e9baa2d
commit 234c84a
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/.github/workflows/hatch_ci.yml b/.github/workflows/hatch_ci.yml
@@ -184,9 +184,8 @@ jobs:
       #     whitesource_project_name: ${{ inputs.whitesource_project_name }}
       #     whitesource_api_key: ${{ secrets.WHITESOURCE_API_KEY }}
 
-      - name: Run WhiteSource Vulnerability Gate
+      - name: Run WhiteSource Policy Gate
         uses: docker://ghcr.io/solacedev/maas-build-actions:latest
-        continue-on-error: true
         env:
           WS_API_KEY: ${{ secrets.WHITESOURCE_API_KEY }}
           WS_PRODUCT_NAME: ${{ inputs.whitesource_product_name }}
@@ -195,20 +194,20 @@ jobs:
           AWS_REGION: ${{ vars.MANIFEST_AWS_REGION }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          WS_JIRA_CHECK: "False" #No Jira Search for Open Vulnerability Issues
           ACTIONS_PATH: /maas-build-actions/actions
-          VIRTUAL_ENV: /maas-build-actions/venv
+          VIRUTAL_ENV: /maas-build-actions/venv
         with:
           entrypoint: /bin/sh
           args: >
             -c "
             source $VIRTUAL_ENV/bin/activate &&
-            cd $ACTIONS_PATH/whitesource-vulnerability-checker &&
-            python whitesource_vulnerability_checker.py
-            "
-        
-      - name: Run WhiteSource Policy Gate
+            cd $ACTIONS_PATH/whitesource-policy-checker &&
+            python whitesource_policy_checker.py
+          "
+
+      - name: Run WhiteSource Vulnerability Gate
         uses: docker://ghcr.io/solacedev/maas-build-actions:latest
+        continue-on-error: true
         env:
           WS_API_KEY: ${{ secrets.WHITESOURCE_API_KEY }}
           WS_PRODUCT_NAME: ${{ inputs.whitesource_product_name }}
@@ -217,14 +216,17 @@ jobs:
           AWS_REGION: ${{ vars.MANIFEST_AWS_REGION }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          WS_JIRA_CHECK: "False" #No Jira Search for Open Vulnerability Issues
           ACTIONS_PATH: /maas-build-actions/actions
-          VIRUTAL_ENV: /maas-build-actions/venv
+          VIRTUAL_ENV: /maas-build-actions/venv
         with:
           entrypoint: /bin/sh
           args: >
             -c "
             source $VIRTUAL_ENV/bin/activate &&
-            cd $ACTIONS_PATH/whitesource-policy-checker &&
-            python whitesource_policy_checker.py
+            cd $ACTIONS_PATH/whitesource-vulnerability-checker &&
+            python whitesource_vulnerability_checker.py
             "
+        
+