From f0bbc40ca6c65ce2392281c4e3aa7f915c4d98a1 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 8 Jul 2022 18:23:10 +0800 Subject: [PATCH] hydra: ARTIQ release 7 --- hydra/artiq.json | 154 +++++++++++++++++++++++------------------------ 1 file changed, 75 insertions(+), 79 deletions(-) diff --git a/hydra/artiq.json b/hydra/artiq.json index db509f1..3643e63 100644 --- a/hydra/artiq.json +++ b/hydra/artiq.json @@ -1,4 +1,29 @@ { + "artiq-nac3": { + "enabled": 1, + "type": 1, + "hidden": false, + "description": "Main ARTIQ packages (with NAC3)", + "flake": "git+https://github.com/m-labs/artiq.git?ref=nac3", + "checkinterval": 300, + "schedulingshares": 10, + "enableemail": false, + "emailoverride": "", + "keepnr": 50 + }, + "nac3": { + "enabled": 1, + "type": 1, + "hidden": false, + "description": "Third generation ARTIQ compiler", + "flake": "git+https://git.m-labs.hk/M-Labs/nac3.git", + "checkinterval": 300, + "schedulingshares": 10, + "enableemail": false, + "emailoverride": "", + "keepnr": 50 + }, + "main-beta": { "enabled": 1, "type": 1, @@ -36,105 +61,41 @@ "keepnr": 50 }, - "artiq-nac3": { + "main": { "enabled": 1, "type": 1, "hidden": false, - "description": "Main ARTIQ packages (with NAC3)", - "flake": "git+https://github.com/m-labs/artiq.git?ref=nac3", + "description": "Main ARTIQ packages (stable version)", + "flake": "git+https://github.com/m-labs/artiq.git?ref=release-7", "checkinterval": 300, "schedulingshares": 10, "enableemail": false, "emailoverride": "", "keepnr": 50 }, - "nac3": { + "extra": { "enabled": 1, "type": 1, "hidden": false, - "description": "Third generation ARTIQ compiler", - "flake": "git+https://git.m-labs.hk/M-Labs/nac3.git", + "description": "Additional ARTIQ packages (stable version)", + "flake": "git+https://git.m-labs.hk/m-labs/artiq-extrapkg.git?ref=release-7", "checkinterval": 300, "schedulingshares": 10, "enableemail": false, "emailoverride": "", "keepnr": 50 }, - - "fast": { - "enabled": 1, - "hidden": false, - "description": "Core ARTIQ packages to build fast for CI purposes", - "nixexprinput": "nixScripts", - "nixexprpath": "artiq-fast.nix", - "checkinterval": 300, - "schedulingshares": 10, - "enableemail": false, - "emailoverride": "", - "keepnr": 50, - "inputs": { - "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-21.05", "emailresponsible": false }, - "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, - "artiqSrc": { "type": "git", "value": "https://github.com/m-labs/artiq.git release-6 1", "emailresponsible": false } - } - }, - "board-generated": { - "enabled": 1, - "hidden": false, - "description": "Generated code for ARTIQ boards (ARTIQ 6 only)", - "nixexprinput": "nixScripts", - "nixexprpath": "artiq-board-generated", - "checkinterval": 14400, - "schedulingshares": 1, - "enableemail": false, - "emailoverride": "", - "keepnr": 50, - "inputs": { - "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-21.05", "emailresponsible": false }, - "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, - "sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems-legacy.git master 1", "emailresponsible": false }, - "artiq-fast": { "type": "sysbuild", "value": "artiq:fast:generated-nix", "emailresponsible": false } - } - }, - "full": { - "enabled": 1, - "hidden": false, - "description": "Full set of ARTIQ packages", - "nixexprinput": "nixScripts", - "nixexprpath": "artiq-full.nix", - "checkinterval": 86400, - "schedulingshares": 1, - "enableemail": false, - "emailoverride": "", - "keepnr": 50, - "inputs": { - "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-21.05", "emailresponsible": false }, - "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, - "use-generated": { "type": "boolean", "value": "true" }, - "artiq-board-generated": { "type": "sysbuild", "value": "artiq:board-generated:generated-nix", "emailresponsible": false } - } - }, "zynq": { "enabled": 1, + "type": 1, "hidden": false, - "description": "ARTIQ on Zynq-7000", - "nixexprinput": "nixScripts", - "nixexprpath": "artiq-zynq.nix", + "description": "ARTIQ on Zynq-7000 (stable version)", + "flake": "git+https://git.m-labs.hk/m-labs/artiq-zynq.git?ref=release-7", "checkinterval": 300, - "schedulingshares": 1, + "schedulingshares": 10, "enableemail": false, "emailoverride": "", - "keepnr": 50, - "inputs": { - "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-21.05", "emailresponsible": false }, - "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, - "artiq-fast": { "type": "sysbuild", "value": "artiq:fast:generated-nix", "emailresponsible": false }, - "artiq-zynq": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/artiq-zynq.git release-6", "emailresponsible": false }, - - "gitea_repo_name": { "value": "artiq-zynq", "type": "string" }, - "gitea_repo_owner": { "value": "M-Labs", "type": "string" }, - "gitea_status_repo": { "value": "artiq-zynq", "type": "string" } - } + "keepnr": 50 }, "fast-legacy": { @@ -151,7 +112,25 @@ "inputs": { "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-21.05", "emailresponsible": false }, "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, - "artiqSrc": { "type": "git", "value": "https://github.com/m-labs/artiq.git release-5 1", "emailresponsible": false } + "artiqSrc": { "type": "git", "value": "https://github.com/m-labs/artiq.git release-6 1", "emailresponsible": false } + } + }, + "board-generated-legacy": { + "enabled": 1, + "hidden": false, + "description": "Generated code for ARTIQ boards (legacy version)", + "nixexprinput": "nixScripts", + "nixexprpath": "artiq-board-generated-legacy", + "checkinterval": 14400, + "schedulingshares": 1, + "enableemail": false, + "emailoverride": "", + "keepnr": 50, + "inputs": { + "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-21.05", "emailresponsible": false }, + "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, + "sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems-legacy.git master 1", "emailresponsible": false }, + "artiq-fast": { "type": "sysbuild", "value": "artiq:fast-legacy:generated-nix", "emailresponsible": false } } }, "full-legacy": { @@ -168,9 +147,26 @@ "inputs": { "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-21.05", "emailresponsible": false }, "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, - "sinaraSystemsSrc": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/sinara-systems-legacy.git master 1", "emailresponsible": false }, - "use-generated": { "type": "boolean", "value": "false" }, - "artiq-fast": { "type": "sysbuild", "value": "artiq:fast-legacy:generated-nix", "emailresponsible": false } + "use-generated": { "type": "boolean", "value": "true" }, + "artiq-board-generated": { "type": "sysbuild", "value": "artiq:board-generated-legacy:generated-nix", "emailresponsible": false } + } + }, + "zynq-legacy": { + "enabled": 1, + "hidden": false, + "description": "ARTIQ on Zynq-7000 (legacy version)", + "nixexprinput": "nixScripts", + "nixexprpath": "artiq-zynq.nix", + "checkinterval": 300, + "schedulingshares": 1, + "enableemail": false, + "emailoverride": "", + "keepnr": 50, + "inputs": { + "nixpkgs": { "type": "git", "value": "https://github.com/NixOS/nixpkgs.git nixos-21.05", "emailresponsible": false }, + "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false }, + "artiq-fast": { "type": "sysbuild", "value": "artiq:fast-legacy:generated-nix", "emailresponsible": false }, + "artiq-zynq": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/artiq-zynq.git release-6", "emailresponsible": false } } },