From 5303a36635500db7e85cfd1a153b81e2ede21715 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Thu, 30 Dec 2021 07:23:53 -0500
Subject: [PATCH] ci: use jq to construct builds matrix

---
 .github/generate-matrix.py | 27 ---------------------------
 .github/workflows/ci.yml   |  6 +++++-
 2 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100755 .github/generate-matrix.py

diff --git a/.github/generate-matrix.py b/.github/generate-matrix.py
deleted file mode 100755
index 6d60ff4..0000000
--- a/.github/generate-matrix.py
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env python3
-import subprocess
-import json
-import sys
-
-
-expr = 'builtins.toJSON (builtins.attrNames (import ./tests {}))'
-
-
-if __name__ == '__main__':
-    attrs = json.loads(json.loads(subprocess.check_output([
-        "nix-instantiate",
-        "--eval",
-        "--expr",
-        expr
-    ])))
-
-    matrix = [
-        {
-            "attr": attr
-        }
-        for attr in attrs
-    ]
-
-    sys.stdout.write("::set-output name=matrix::")
-    json.dump({"include": matrix}, sys.stdout)
-    sys.stdout.flush()
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 82fd3b9..332cd9e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,11 @@ jobs:
           nix_path: nixpkgs=channel:nixos-unstable
           extra_nix_config: experimental-features = nix-command
       - id: set-matrix
-        run: ./.github/generate-matrix.py
+        run: |
+          set -euo pipefail
+
+          matrix="$(nix-instantiate --eval --json --expr 'builtins.attrNames (import ./tests {})' | jq '{attr: .}')"
+          echo "::set-output name=matrix::$matrix"
 
   builds:
     needs: matrix_generate