refactor: Pull jq filter into a file and format it

Makes the filter much easier to read, now that it's getting more complex.
nix-community · Sep 26, 2023 · 6dfe669 · 6dfe669
1 parent 49c01c0
commit 6dfe669
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
         nix_path: nixpkgs=channel:nixos-unstable
     - uses: actions/checkout@v3
     - name: Check format
-      run: nix-shell --packages jq --pure --run 'diff --unified overrides/build-systems.json <(jq --raw-output --sort-keys ".[] |= sort_by(if type==\"string\" then . else .from != null end)" < overrides/build-systems.json)'
+      run: nix-shell --packages jq --pure --run 'diff --unified overrides/build-systems.json <(jq --from-file overrides/sort-build-systems.jq --raw-output --sort-keys < overrides/build-systems.json)'
 
   nixpkgs-fmt:
     runs-on: ubuntu-latest

diff --git a/overrides/sort-build-systems.jq b/overrides/sort-build-systems.jq
@@ -0,0 +1,8 @@
+.[] |= sort_by(
+    if type == "string"
+    then
+        .
+    else
+        .from != null
+    end
+)