From d4c36b8cfdc3ed37b2119a7d67e9bb2d35a0e2ac Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 12 Feb 2022 10:19:15 +0800 Subject: [PATCH] nixbld: use ARTIQ flake output for manual --- nixbld-etc-nixos/configuration.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix index 472c840c..003ea490 100644 --- a/nixbld-etc-nixos/configuration.nix +++ b/nixbld-etc-nixos/configuration.nix @@ -339,12 +339,12 @@ in - job = artiq:full-beta:artiq-manual-html + job = artiq:main-beta:artiq-manual-html command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-manual-html-beta - 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 + job = artiq:main-beta:artiq-manual-pdf + command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-manual-pdf-beta job = artiq:full-beta:conda-channel @@ -571,10 +571,10 @@ in alias = "${hydraWwwOutputs}/sipyco-manual-latexpdf/share/doc/sipyco-manual/SiPyCo.pdf"; }; locations."/artiq/manual-beta/" = { - alias = "${hydraWwwOutputs}/artiq-manual-html-beta/share/doc/artiq-manual/html/"; + alias = "${hydraWwwOutputs}/artiq-manual-html-beta/"; }; locations."=/artiq/manual-beta.pdf" = { - alias = "${hydraWwwOutputs}/artiq-manual-latexpdf-beta/share/doc/artiq-manual/ARTIQ.pdf"; + alias = "${hydraWwwOutputs}/artiq-manual-pdf-beta/ARTIQ.pdf"; }; locations."/artiq/manual/" = { alias = "${hydraWwwOutputs}/artiq-manual-html/share/doc/artiq-manual/html/";