From 4e6686dbe92d2583aaba66f068193ad28a7a89d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Bourdeauducq?= Date: Wed, 5 Jun 2024 11:23:24 +0800 Subject: [PATCH] nixbld: fix gitea emails --- nixbld-etc-nixos/configuration.nix | 31 +++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix index e61ece39..51a8cf37 100644 --- a/nixbld-etc-nixos/configuration.nix +++ b/nixbld-etc-nixos/configuration.nix @@ -660,6 +660,10 @@ in job = artiq:extra-beta:conda-channel command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-conda-channel-beta + + job = artiq:extra-beta:msys2-repos + command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-msys2-repos-beta + job = artiq:main:artiq-manual-html @@ -673,17 +677,21 @@ in job = artiq:extra:conda-channel command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-conda-channel + + job = artiq:extra:msys2-repos + command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-msys2-repos + - job = artiq:full-legacy:artiq-manual-html + job = artiq:main-legacy:artiq-manual-html command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-manual-html-legacy - job = artiq:full-legacy:artiq-manual-latexpdf - command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-manual-latexpdf-legacy + job = artiq:main-legacy:artiq-manual-pdf + command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-manual-pdf-legacy - job = artiq:full-legacy:conda-channel + job = artiq:extra-legacy:conda-channel command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-conda-channel-legacy @@ -692,11 +700,6 @@ in command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-conda-channel-archives/$(jq -r '.build' < $HYDRA_JSON) - - job = artiq:extra-beta:msys2-repos - command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-msys2-repos-beta - - job = artiq:main-nac3:msys2-repos command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-msys2-repos-nac3 @@ -876,10 +879,10 @@ in alias = "${hydraWwwOutputs}/artiq-manual-pdf/ARTIQ.pdf"; }; locations."/artiq/manual-legacy/" = { - alias = "${hydraWwwOutputs}/artiq-manual-html-legacy/share/doc/artiq-manual/html/"; + alias = "${hydraWwwOutputs}/artiq-manual-html-legacy/"; }; locations."=/artiq/manual-legacy.pdf" = { - alias = "${hydraWwwOutputs}/artiq-manual-latexpdf-legacy/share/doc/artiq-manual/ARTIQ.pdf"; + alias = "${hydraWwwOutputs}/artiq-manual-pdf-legacy/ARTIQ.pdf"; }; # legacy content @@ -915,6 +918,12 @@ in autoindex on; ''; }; + locations."/artiq/" = { + alias = "${hydraWwwOutputs}/artiq-msys2-repos/"; + extraConfig = '' + autoindex on; + ''; + }; locations."/artiq-nac3/" = { alias = "${hydraWwwOutputs}/artiq-msys2-repos-nac3/"; extraConfig = ''