From 110f968199759cfc1fecfdd3ab78c9367eef6125 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Tue, 19 Feb 2019 20:47:44 +0800 Subject: [PATCH] build Sayma satellite package --- jobsets.nix | 4 ++-- sinara-systems.nix | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/jobsets.nix b/jobsets.nix index 36d2a52..897f583 100644 --- a/jobsets.nix +++ b/jobsets.nix @@ -7,7 +7,7 @@ "main": { "enabled": 1, "hidden": false, - "description": "Main ARTIQ packages", + "description": "Main ARTIQ packages and board support packages for HITL CI", "nixexprinput": "nixScripts", "nixexprpath": "main.nix", "checkinterval": 300, @@ -24,7 +24,7 @@ "sinara-systems": { "enabled": 1, "hidden": false, - "description": "Board support artefacts for generic Sinara systems", + "description": "Board support packages for other Sinara systems", "nixexprinput": "nixScripts", "nixexprpath": "sinara-systems.nix", "checkinterval": 86400, diff --git a/sinara-systems.nix b/sinara-systems.nix index 8f8114a..958a922 100644 --- a/sinara-systems.nix +++ b/sinara-systems.nix @@ -23,8 +23,7 @@ let sha256 = "$HASH"; leaveDotGit = true; }; - in - pkgs.lib.lists.foldr (variant: start: + generic-kasli = pkgs.lib.lists.foldr (variant: start: let json = builtins.toPath (src + "/\''${variant}.json"); boardBinaries = artiq-board { @@ -38,7 +37,15 @@ let boardBinaries = boardBinaries; inherit target variant; }; - }) {} variants + }) {} variants; + in + generic-kasli // { + artiq-board-sayma-satellite = artiq-board { + target = "sayma"; + variant = "satellite"; + buildCommand = "python -m artiq.gateware.targets.sayma_rtm && python -m artiq.gateware.targets.sayma_amc -V satellite"; + }; + } EOF ''; jobs = builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) (import generatedNix { inherit pkgs; });