More fixes

Author: greenc-FNAL

.github/actions/detect-relevant-changes/action.yaml

@@ -54,7 +54,9 @@ runs:
         DEFAULT_TYPE_PATTERNS[cmake]=$'CMakeLists.txt\n*.cmake'
         DEFAULT_TYPE_PATTERNS[python]=$'*.py'
         DEFAULT_TYPE_PATTERNS[jsonnet]=$'*.jsonnet\n*.libsonnet'
-
+        declare -A NON_GENERATED_TYPES
+        NON_GENERATED_TYPES[jsonnet]="1"
+        
         parse_list() {
           local input="$1"
           printf '%s' "$input" | tr ',' '\n' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' -e '/^$/d'
@@ -126,6 +128,9 @@ runs:
           }
 
           for type in "${REQUESTED_TYPES[@]}"; do
+            if [ -n "${NON_GENERATED_TYPES[$type]}" ]; then
+              continue
+            fi
             patterns=${TYPE_PATTERNS[$type]:-}
             if [ -z "$patterns" ]; then
               echo "::warning::No patterns defined for type '$type'"

.github/workflows/jsonnet-format-check.yaml

@@ -101,7 +101,8 @@ jobs:
       id: lint
       working-directory: ${{ env.local_checkout_path }}
       run: |
-        find . \( -name "*.jsonnet" -o -name "*.jsonnet.in" -o -name "*.libsonnet" -o -name "*.libsonnet.in" \) -exec jsonnetfmt --test {} \;
+        find . \( -name "*.jsonnet" -o -name "*.libsonnet" \) -print0 | xargs -0 -r -I {} \
+             bash -c 'jsonnetfmt --test "{}" || (echo "FAILED: {}" && diff -u <(jsonnetfmt "{}") "{}" && exit 1)'
       continue-on-error: true
 
     - name: Evaluate jsonnetfmt result

.github/workflows/jsonnet-format-fix.yaml

@@ -81,7 +81,7 @@ jobs:
         id: lint
         working-directory: ${{ env.local_checkout_path }}
         run: |
-          find . \( -name "*.jsonnet" -o -name "*.jsonnet.in" -o -name "*.libsonnet" -o -name "*.libsonnet.in" \) -exec jsonnetfmt -i {} \;
+          find . \( -name "*.jsonnet" -o -name "*.libsonnet" \) -print0 | xargs -0 -r jsonnetfmt -i
         continue-on-error: true
 
       - name: Handle fix commit