From 50a5be78a92144f1a9f43f174dbd50ffe0ce136c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 30 Aug 2023 16:09:34 +0200 Subject: [PATCH 1/3] Update to handle the new schema format --- src/mixed-flake.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/mixed-flake.nix b/src/mixed-flake.nix index b022f1b..078b052 100644 --- a/src/mixed-flake.nix +++ b/src/mixed-flake.nix @@ -17,8 +17,6 @@ mkChildren = children: { inherit children; }; - mkLeaf = leaf: { inherit leaf; }; - in rec { @@ -26,7 +24,7 @@ allSchemas = (flake.outputs.schemas or defaultSchemas) // schemaOverrides; # FIXME: make this configurable - defaultSchemas = (builtins.getFlake "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.0.6+rev-8b320d78bfbc47515f3366b43e1a29c69519f36a/0189d657-3901-716b-9cde-7ec5aacc7cf8/source.tar.gz?narHash=sha256-3H1AXsE4SRqT1tZDb2gxdSwf3JInOgS1F8nq2QsXmHg=").schemas; + defaultSchemas = (builtins.getFlake "github:DeterminateSystems/flake-schemas/25fcca8e8baa402de593a3854fcc50581f4e912a").schemas; # Ignore legacyPackages for now, since it's very big and throws uncatchable errors. schemaOverrides.legacyPackages = { @@ -65,15 +63,13 @@ if attrs ? children then mkChildren (builtins.mapAttrs (childName: child: doFilter child) attrs.children) - else if attrs ? leaf then - mkLeaf - { - forSystems = attrs.leaf.forSystems or null; - doc = if attrs.leaf ? doc then attrs.leaf.doc else null; - #evalChecks = attrs.leaf.evalChecks or {}; - } else - throw "Schema returned invalid tree node." + { + forSystems = attrs.forSystems or null; + shortDescription = attrs.shortDescription or null; + what = attrs.what or null; + #evalChecks = attrs.evalChecks or {}; + } else { }; in From bc87ee575d2b5f54450b9d2b0f6dbd37b3b0d4b8 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Wed, 30 Aug 2023 09:28:34 -0700 Subject: [PATCH 2/3] Update production-test.yml --- .github/workflows/production-test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/production-test.yml b/.github/workflows/production-test.yml index 6aa1a0b..36cd959 100644 --- a/.github/workflows/production-test.yml +++ b/.github/workflows/production-test.yml @@ -43,7 +43,8 @@ jobs: uses: ./ with: visibility: "hidden" - rolling-prefix: "0.0" + rolling-minor: 0 + rolling: true log-directives: "flakehub_push=trace" logger: "pretty" flakehub-push-binary: ./flakehub-push-X64-Linux/flakehub-push From 8f77f4dee435b1aaf31338a541a7140ff6c32fcc Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Wed, 30 Aug 2023 09:39:24 -0700 Subject: [PATCH 3/3] Update production-test.yml --- .github/workflows/production-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/production-test.yml b/.github/workflows/production-test.yml index 36cd959..a03d009 100644 --- a/.github/workflows/production-test.yml +++ b/.github/workflows/production-test.yml @@ -16,6 +16,7 @@ jobs: || (github.event.action != 'labeled' && contains(github.event.pull_request.labels.*.name, 'production test')) production-test: + needs: build runs-on: UbuntuLatest32Cores128G timeout-minutes: 5 if: |