1
0
Fork 0

build Sayma satellite package

This commit is contained in:
Sebastien Bourdeauducq 2019-02-19 20:47:44 +08:00
parent ac3803b1cf
commit 110f968199
2 changed files with 12 additions and 5 deletions

View File

@ -7,7 +7,7 @@
"main": { "main": {
"enabled": 1, "enabled": 1,
"hidden": false, "hidden": false,
"description": "Main ARTIQ packages", "description": "Main ARTIQ packages and board support packages for HITL CI",
"nixexprinput": "nixScripts", "nixexprinput": "nixScripts",
"nixexprpath": "main.nix", "nixexprpath": "main.nix",
"checkinterval": 300, "checkinterval": 300,
@ -24,7 +24,7 @@
"sinara-systems": { "sinara-systems": {
"enabled": 1, "enabled": 1,
"hidden": false, "hidden": false,
"description": "Board support artefacts for generic Sinara systems", "description": "Board support packages for other Sinara systems",
"nixexprinput": "nixScripts", "nixexprinput": "nixScripts",
"nixexprpath": "sinara-systems.nix", "nixexprpath": "sinara-systems.nix",
"checkinterval": 86400, "checkinterval": 86400,

View File

@ -23,8 +23,7 @@ let
sha256 = "$HASH"; sha256 = "$HASH";
leaveDotGit = true; leaveDotGit = true;
}; };
in generic-kasli = pkgs.lib.lists.foldr (variant: start:
pkgs.lib.lists.foldr (variant: start:
let let
json = builtins.toPath (src + "/\''${variant}.json"); json = builtins.toPath (src + "/\''${variant}.json");
boardBinaries = artiq-board { boardBinaries = artiq-board {
@ -38,7 +37,15 @@ let
boardBinaries = boardBinaries; boardBinaries = boardBinaries;
inherit target variant; 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 EOF
''; '';
jobs = builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) (import generatedNix { inherit pkgs; }); jobs = builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) (import generatedNix { inherit pkgs; });