From 2f493ab9d352b169d9b9c41b3f4832609a69b1c1 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sat, 12 Feb 2022 10:08:57 +0800
Subject: [PATCH] reorganize artiq hydra settings, rename flake to main-beta

---
 hydra/artiq.json | 125 +++++++++++++++++++++++------------------------
 1 file changed, 62 insertions(+), 63 deletions(-)

diff --git a/hydra/artiq.json b/hydra/artiq.json
index 01db2ee..37107e9 100644
--- a/hydra/artiq.json
+++ b/hydra/artiq.json
@@ -1,8 +1,46 @@
 {
+    "main-beta": {
+        "enabled": 1,
+        "type": 1,
+        "hidden": false,
+        "description": "Main ARTIQ packages (beta version)",
+        "flake": "git+https://github.com/m-labs/artiq.git",
+        "checkinterval": 300,
+        "schedulingshares": 10,
+        "enableemail": false,
+        "emailoverride": "",
+        "keepnr": 50
+    },
+    "zynq-beta": {
+        "enabled": 1,
+        "type": 1,
+        "hidden": false,
+        "description": "ARTIQ on Zynq-7000 (beta version)",
+        "flake": "git+https://git.m-labs.hk/m-labs/artiq-zynq.git",
+        "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
+    },
+
     "fast-beta": {
         "enabled": 1,
         "hidden": false,
-        "description": "Core ARTIQ packages to build fast for CI purposes (beta version)",
+        "description": "Core ARTIQ packages to build fast for CI purposes (beta version, legacy non-flakes packaging)",
         "nixexprinput": "nixScripts",
         "nixexprpath": "artiq-fast.nix",
         "checkinterval": 300,
@@ -19,7 +57,7 @@
     "full-beta": {
         "enabled": 1,
         "hidden": false,
-        "description": "Full set of ARTIQ packages (beta version)",
+        "description": "Full set of ARTIQ packages (beta version, legacy non-flakes packaging)",
         "nixexprinput": "nixScripts",
         "nixexprpath": "artiq-full.nix",
         "checkinterval": 86400,
@@ -89,6 +127,28 @@
             "artiq-board-generated": { "type": "sysbuild", "value": "artiq:board-generated:generated-nix", "emailresponsible": false }
         }
     },
+    "zynq": {
+        "enabled": 1,
+        "hidden": false,
+        "description": "ARTIQ on Zynq-7000",
+        "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: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" }
+        }
+    },
 
     "fast-legacy": {
         "enabled": 1,
@@ -127,32 +187,6 @@
         }
     },
 
-    "fast-flakes": {
-        "enabled": 1,
-        "type": 1,
-        "hidden": false,
-        "description": "Core ARTIQ packages to build fast for CI purposes (Nix flakes version)",
-        "flake": "git+https://github.com/m-labs/artiq.git",
-        "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
-    },
-
     "gluelogic": {
         "enabled": 1,
         "hidden": false,
@@ -185,40 +219,5 @@
         "enableemail": false,
         "emailoverride": "",
         "keepnr": 50
-    },
-
-    "zynq-beta": {
-        "enabled": 1,
-        "type": 1,
-        "hidden": false,
-        "description": "ARTIQ on Zynq-7000 (beta version)",
-        "flake": "git+https://git.m-labs.hk/m-labs/artiq-zynq.git",
-        "checkinterval": 300,
-        "schedulingshares": 10,
-        "enableemail": false,
-        "emailoverride": "",
-        "keepnr": 50
-    },
-    "zynq": {
-        "enabled": 1,
-        "hidden": false,
-        "description": "ARTIQ on Zynq-7000",
-        "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: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" }
-        }
     }
 }