build ARTIQ releases

hydra/artiq.nix

@@ -4,6 +4,41 @@
     ''
     cat > $out << EOF
     {
+        "fast-beta": {
+            "enabled": 1,
+            "hidden": false,
+            "description": "Core ARTIQ packages to build fast for CI purposes (beta version)",
+            "nixexprinput": "nixScripts",
+            "nixexprpath": "artiq-fast.nix",
+            "checkinterval": 300,
+            "schedulingshares": 10,
+            "enableemail": false,
+            "emailoverride": "",
+            "keepnr": 10,
+            "inputs": {
+                "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-19.09", "emailresponsible": false },
+                "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
+                "artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git master 1", "emailresponsible": false }
+            }
+        },
+        "full-beta": {
+            "enabled": 1,
+            "hidden": false,
+            "description": "Full set of ARTIQ packages (beta version)",
+            "nixexprinput": "nixScripts",
+            "nixexprpath": "artiq-full.nix",
+            "checkinterval": 86400,
+            "schedulingshares": 1,
+            "enableemail": false,
+            "emailoverride": "",
+            "keepnr": 10,
+            "inputs": {
+                "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-19.09", "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.git master 1", "emailresponsible": false },
+                "artiq-fast": { "type": "sysbuild", "value": "artiq:fast-beta:generated-nix", "emailresponsible": false }
+            }
+        },
         "fast": {
             "enabled": 1,
             "hidden": false,
@@ -18,7 +53,7 @@
             "inputs": {
                 "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs-channels nixos-19.09", "emailresponsible": false },
                 "nixScripts": { "type": "git", "value": "https://git.m-labs.hk/M-Labs/nix-scripts.git", "emailresponsible": false },
-                "artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git master 1", "emailresponsible": false }
+                "artiqSrc": { "type": "git", "value": "git://github.com/m-labs/artiq.git release-5 1", "emailresponsible": false }
             }
         },
         "full": {

nixbld-etc-nixos/configuration.nix

@@ -250,6 +250,7 @@ ACTION=="add", SUBSYSTEM=="tty", \
         job = web:web:web
         command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/web
       </runcommand>
+
       <runcommand>
         job = artiq:full:sipyco-manual-html
         command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/sipyco-manual-html
@@ -258,18 +259,32 @@ ACTION=="add", SUBSYSTEM=="tty", \
         job = artiq:full:sipyco-manual-latexpdf
         command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/sipyco-manual-latexpdf
       </runcommand>
+
       <runcommand>
-        job = artiq:full:artiq-manual-html
+        job = artiq:full-beta:artiq-manual-html
         command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-manual-html-beta
       </runcommand>
       <runcommand>
-        job = artiq:full:artiq-manual-latexpdf
+        job = artiq:full-beta:artiq-manual-latexpdf
         command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-manual-latexpdf-beta
       </runcommand>
       <runcommand>
-        job = artiq:full:conda-channel
+        job = artiq:full-beta:conda-channel
         command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-conda-channel-beta
       </runcommand>
+
+      <runcommand>
+        job = artiq:full:artiq-manual-html
+        command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-manual-html
+      </runcommand>
+      <runcommand>
+        job = artiq:full:artiq-manual-latexpdf
+        command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-manual-latexpdf
+      </runcommand>
+      <runcommand>
+        job = artiq:full:conda-channel
+        command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-conda-channel
+      </runcommand>
       '';
   };
   systemd.services.hydra-www-outputs-init = {
@@ -416,20 +431,20 @@ ACTION=="add", SUBSYSTEM=="tty", \
         locations."=/artiq/manual-beta.pdf" = {
           alias = "${hydraWwwOutputs}/artiq-manual-latexpdf-beta/share/doc/artiq-manual/ARTIQ.pdf";
         };
+        locations."/artiq/manual/" = {
+          alias = "${hydraWwwOutputs}/artiq-manual-html/share/doc/artiq-manual/html/";
+        };
+        locations."=/artiq/manual.pdf" = {
+          alias = "${hydraWwwOutputs}/artiq-manual-latexpdf/share/doc/artiq-manual/ARTIQ.pdf";
+        };
 
         # legacy content
         locations."/migen/manual/" = {
           alias = "/var/www/m-labs.hk.old/migen/manual/";
         };
-        locations."/artiq/manual/" = {
-          alias = "/var/www/m-labs.hk.old/artiq/manual-release-4/";
-        };
         locations."/artiq/manual-release-4/" = {
           alias = "/var/www/m-labs.hk.old/artiq/manual-release-4/";
         };
-        locations."/artiq/manual-release-3/" = {
-          alias = "/var/www/m-labs.hk.old/artiq/manual-release-3/";
-        };
       };
     in {
       "m-labs.hk" = mainWebsite;
@@ -459,6 +474,13 @@ ACTION=="add", SUBSYSTEM=="tty", \
             index bogus_index_file;
           '';
         };
+        locations."/artiq/" = {
+          alias = "${hydraWwwOutputs}/artiq-conda-channel/";
+          extraConfig = ''
+            autoindex on;
+            index bogus_index_file;
+          '';
+        };
       };
       "git.m-labs.hk" = {
         forceSSL = true;