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

Author: maxstack

.github/workflows/main.yml

@@ -27,62 +27,66 @@ jobs:
   files_changed:
     name: Determine files changed
     needs: lint
-    # continue-on-error: true # Uncomment once integration is finished
     runs-on: ubuntu-latest
-    # Map a step output to a job output
+    # Map a step output to a job output, this allows other jobs to be gated on the filter results
     outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-      paths_result: ${{ steps.skip_check.outputs.paths_result }}
+        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 }}
     steps:
-      - name: Build paths result
-        id: skip_check
-        # For security we use the commit of fkirc/skip-duplicate-actions@v5
-        uses: fkirc/skip-duplicate-actions@f75f66ce1886f00957d99748a42c724f4330bdcf
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Paths Filter
+        # For safety using commit of dorny/paths-filter@v3
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
+        id: filter
         with:
-          cancel_others: true
-          skip_after_successful_duplicate: false
-          #do_not_skip: '[ "pull_request", "push", "workflow_dispatch" ]'
-          paths_filter: |
+          list-files: 'json'
+          filters: |
             extra_push:
-              paths:
-                - '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'
+              - '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:
-              paths:
-                - 'environments/.stackhpc/tofu/cluster_image.auto.tfvars.json'
-                - 'ansible/roles/doca/**'
-                - 'ansible/roles/cuda/**'
-                - 'ansible/roles/lustre/**'
-                - '.github/workflows/extra.yml'
+              - 'environments/.stackhpc/tofu/cluster_image.auto.tfvars.json'
+              - 'ansible/roles/doca/**'
+              - 'ansible/roles/cuda/**'
+              - 'ansible/roles/lustre/**'
+              - '.github/workflows/extra.yml'
             stackhpc:
-              paths:
-                - '**'
-                - '!dev/**'
-                - 'dev/setup-env.sh'
-                - '!docs/**'
-                - '!README.md'
-                - '!.gitignore'
-                - '!.github/workflows/'
-                - '.github/workflows/stackhpc'
+              - '**'
+              - '!dev/**'
+              - 'dev/setup-env.sh'
+              - '!docs/**'
+              - '!README.md'
+              - '!.gitignore'
+              - '!.github/workflows/'
+              - '.github/workflows/stackhpc'
             trivvyscan:
-              paths:
-                - 'environments/.stackhpc/tofu/cluster_image.auto.tfvars.json'
-      - name: Echo paths result
+              - 'environments/.stackhpc/tofu/cluster_image.auto.tfvars.json'
+
+      - name: Paths Filter Result
         run: >
-          echo '${{ steps.skip_check.outputs.paths_result }}'
-          | jq -r '.'
+          echo 'extra_push: ${{ steps.filter.outputs.extra_push }}' | jq -r '.'
+          echo 'extra_pull_request: ${{ steps.filter.outputs.extra_pull_request }}' | jq -r '.'
+          echo 'stackhpc: ${{ steps.filter.outputs.stackhpc }}' | jq -r '.'
+          echo 'trivvyscan: ${{ steps.filter.outputs.trivvyscan }}' | 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: |
-      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 ))
+      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'
     #uses: ./.github/workflows/extra.yml
     steps: # TEST
       - name: Test extra build...
@@ -95,8 +99,10 @@ 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.should_skip != 'true' && !fromJSON(needs.files_changed.outputs.paths_result).stackhpc.should_skip
+      needs.files_changed.outputs.stackhpc == 'true'
     #uses: ./.github/workflows/stackhpc.yml
     steps: # TEST
       - name: Test deployment and reimage on OpenStack...
@@ -109,9 +115,12 @@ 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.should_skip != 'true' && !fromJSON(needs.files_changed.outputs.paths_result).trivvyscan.should_skip
+      needs.files_changed.outputs.trivvyscan == 'true'
     #uses: ./.github/workflows/trivvyscan.yml
     steps: # TEST
       - name: Trivy scan image for vulnerabilities...