sort tags

konveyor · Oct 20, 2023 · a6898a7 · a6898a7
1 parent b1d5845
commit a6898a7
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/.github/workflows/testing.yaml b/.github/workflows/testing.yaml
@@ -27,12 +27,13 @@ jobs:
           expected_file=./test-data/analysis-output.yaml
           actual_file=./output/output.yaml
           function filter_and_sort() {
-            yq e 'del(.[].skipped) | del(.[].unmatched)' $1 > /tmp/filtered
-            yq e '.[]?.violations |= (. | to_entries | sort_by(.key) | from_entries)' /tmp/filtered > /tmp/sorted
-            yq e '.[]?.violations[]?.incidents |= sort_by(.uri)' /tmp/sorted > $1 
+            yq e 'del(.[].skipped) | del(.[].unmatched)' $1 \
+              | yq e '.[]?.violations |= (. | to_entries | sort_by(.key) | from_entries)' \
+              | yq e '.[]?.violations[]?.incidents |= sort_by(.uri)' \
+              | yq e '.[] | (.tags // []) |= sort'
           }
-          filter_and_sort $expected_file
-          filter_and_sort $actual_file
+          filter_and_sort $expected_file > $expected_file
+          filter_and_sort $actual_file > $actual_file
           diff $expected_file $actual_file
 
       - name: Fail if dependencies output does not match expected