Tweak github action used to detect changed paths on push/pull request

Author: maxstack

.github/workflows/main.yml

@@ -30,63 +30,78 @@ jobs:
     runs-on: ubuntu-latest
     # Map a step output to a job output, this allows other jobs to be gated on the filter results
     outputs:
-        extra_push: ${{ steps.filter.outputs.extra_push }}
-        extra_pull_request: ${{ steps.filter.outputs.extra_pull_request }}
-        stackhpc: ${{ steps.filter.outputs.stackhpc }}
-        trivvyscan: ${{ steps.filter.outputs.trivvyscan }}
+        extra_on_push: ${{ steps.filter_some.outputs.extra_on_push }}
+        extra_on_pull_request: ${{ steps.filter_some.outputs.extra_on_pull_request }}
+        stackhpc_some: ${{ steps.filter_some.outputs.stackhpc }}
+        stackhpc_every: ${{ steps.filter_every.outputs.stackhpc }}
+        trivvyscan: ${{ steps.filter_some.outputs.trivvyscan }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Paths Filter
+      - name: Paths matching on any filter 
         # For safety using commit of dorny/paths-filter@v3
         uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
-        id: filter
+        id: filter_some
         with:
+          predicate-quantifier: 'some'
           list-files: 'json'
           filters: |
-            extra_push:
+            extra_on_push:
               - 'environments/.stackhpc/tofu/cluster_image.auto.tfvars.json'
               - 'ansible/roles/doca/**'
               - 'ansible/roles/cuda/**'
               - 'ansible/roles/slurm_recompile/**' # runs on cuda group
               - 'ansible/roles/lustre/**'
               - '.github/workflows/extra.yml'
-            extra_pull_request:
+            extra_on_pull_request:
               - 'environments/.stackhpc/tofu/cluster_image.auto.tfvars.json'
               - 'ansible/roles/doca/**'
               - 'ansible/roles/cuda/**'
               - 'ansible/roles/lustre/**'
               - '.github/workflows/extra.yml'
+            stackhpc:
+              #- '**'
+              #- '!dev/**'
+              - 'dev/setup-env.sh'
+              #- '!docs/**'
+              #- '!README.md'
+              #- '!.gitignore'
+              #- '!.github/workflows/'
+              - '.github/workflows/stackhpc'
+            trivvyscan:
+              - 'environments/.stackhpc/tofu/cluster_image.auto.tfvars.json'
+
+      - name: Paths matching on every filter
+        # For safety using commit of dorny/paths-filter@v3
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
+        id: filter_every
+        with:
+          predicate-quantifier: 'every'
+          list-files: 'json'
+          filters: |
             stackhpc:
               - '**'
               - '!dev/**'
-              - 'dev/setup-env.sh'
               - '!docs/**'
               - '!README.md'
               - '!.gitignore'
               - '!.github/workflows/'
-              - '.github/workflows/stackhpc'
-            trivvyscan:
-              - 'environments/.stackhpc/tofu/cluster_image.auto.tfvars.json'
 
       - name: Paths Filter Result
         run: >
-          echo '{ "extra_push_files": ${{ steps.filter.outputs.extra_push_files }} }' | jq -r '.';
-          echo '{ "extra_pull_request_files": ${{ steps.filter.outputs.extra_pull_request_files }} }' | jq -r '.';
-          echo '{ "stackhpc_files": ${{ steps.filter.outputs.stackhpc_files }} }' | jq -r '.';
-          echo '{ "trivvyscan_files": ${{ steps.filter.outputs.trivvyscan_files }} }' | jq -r '.'
+          echo '{ "extra_on_push_files": ${{ steps.filter_some.outputs.extra_on_push_files }} }' | jq -r '.';
+          echo '{ "extra_on_pull_request_files": ${{ steps.filter_some.outputs.extra_on_pull_request_files }} }' | jq -r '.';
+          echo '{ "stackhpc_some_files": ${{ steps.filter_some.outputs.stackhpc_some_files }} }' | jq -r '.';
+          echo '{ "stackhpc_every_files": ${{ steps.filter_every.outputs.stackhpc_every_files }} }' | jq -r '.';
+          echo '{ "trivvyscan_files": ${{ steps.filter_some.outputs.trivvyscan_files }} }' | jq -r '.'
 
   extra:
     name: Test extra build
     needs: files_changed
-    #if: |
-    #  needs.files_changed.outputs.should_skip != 'true' &&
-    #  (( github.event_name != 'pull_request' && !fromJSON(needs.files_changed.outputs.paths_result).extra_push.should_skip ) ||
-    #   ( github.event_name == 'pull_request' && !fromJSON(needs.files_changed.outputs.paths_result).extra_pull_request.should_skip ))
     if: |
-      github.event_name != 'pull_request' && needs.files_changed.outputs.extra_push == 'true' ||
-      github.event_name == 'pull_request' && needs.files_changed.outputs.extra_pull_request == 'true'
+      github.event_name != 'pull_request' && needs.files_changed.outputs.extra_on_push == 'true' ||
+      github.event_name == 'pull_request' && needs.files_changed.outputs.extra_on_pull_request == 'true'
     #uses: ./.github/workflows/extra.yml
     steps: # TEST
       - name: Test extra build...
@@ -99,10 +114,9 @@ jobs:
   stackhpc:
     name: Test deployment and reimage on OpenStack
     needs: files_changed
-    #if: |
-    #  needs.files_changed.outputs.should_skip != 'true' && !fromJSON(needs.files_changed.outputs.paths_result).stackhpc.should_skip
     if: |
-      needs.files_changed.outputs.stackhpc == 'true'
+      needs.files_changed.outputs.stackhpc_some == 'true' ||
+      needs.files_changed.outputs.stackhpc_every == 'true'
     #uses: ./.github/workflows/stackhpc.yml
     steps: # TEST
       - name: Test deployment and reimage on OpenStack...
@@ -115,9 +129,6 @@ jobs:
   trivvyscan:
     name: Trivy scan image for vulnerabilities
     needs: files_changed
-    #if: |
-    #  github.event_name == 'pull_request' &&
-    #  needs.files_changed.outputs.should_skip != 'true' && !fromJSON(needs.files_changed.outputs.paths_result).trivvyscan.should_skip
     if: |
       github.event_name == 'pull_request' &&
       needs.files_changed.outputs.trivvyscan == 'true'