From e5250c88fbe8dfd1c1bf04ca7fed74246ae97b20 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 8 Jul 2022 19:00:38 +0800 Subject: [PATCH] nixbld: web/hydra setup for flakes in ARTIQ stable --- nixbld-etc-nixos/configuration.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix index 29ed663..4b3ed1a 100644 --- a/nixbld-etc-nixos/configuration.nix +++ b/nixbld-etc-nixos/configuration.nix @@ -398,15 +398,15 @@ in - job = artiq:full:artiq-manual-html + job = artiq:main:artiq-manual-html command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-manual-html - 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 + job = artiq:main:artiq-manual-pdf + command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-manual-pdf - job = artiq:full:conda-channel + job = artiq:extra:conda-channel command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-conda-channel @@ -600,10 +600,10 @@ in alias = "${hydraWwwOutputs}/artiq-manual-pdf-beta/ARTIQ.pdf"; }; locations."/artiq/manual/" = { - alias = "${hydraWwwOutputs}/artiq-manual-html/share/doc/artiq-manual/html/"; + alias = "${hydraWwwOutputs}/artiq-manual-html/"; }; locations."=/artiq/manual.pdf" = { - alias = "${hydraWwwOutputs}/artiq-manual-latexpdf/share/doc/artiq-manual/ARTIQ.pdf"; + alias = "${hydraWwwOutputs}/artiq-manual-pdf/ARTIQ.pdf"; }; locations."/artiq/manual-legacy/" = { alias = "${hydraWwwOutputs}/artiq-manual-html-legacy/share/doc/artiq-manual/html/";