diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix index b7aa310..93daa0b 100644 --- a/nixbld-etc-nixos/configuration.nix +++ b/nixbld-etc-nixos/configuration.nix @@ -362,6 +362,11 @@ in command = [ $(jq '.buildStatus' < $HYDRA_JSON) = 0 ] && ln -sfn $(jq -r '.outputs[0].path' < $HYDRA_JSON) ${hydraWwwOutputs}/artiq-conda-channel-legacy + + job = artiq:*:conda-channel + 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) + + jobs = artiq:fast.*:extended-tests @@ -381,7 +386,10 @@ in before = [ "hydra-queue-runner.service" ]; serviceConfig = { Type = "oneshot"; - ExecStart = [ "${pkgs.coreutils}/bin/mkdir -p ${hydraWwwOutputs}" "${pkgs.coreutils}/bin/chown hydra-queue-runner:hydra ${hydraWwwOutputs}" ]; + ExecStart = [ + "${pkgs.coreutils}/bin/mkdir -p ${hydraWwwOutputs} ${hydraWwwOutputs}/artiq-conda-channel-archives" + "${pkgs.coreutils}/bin/chown hydra-queue-runner:hydra ${hydraWwwOutputs} ${hydraWwwOutputs}/artiq-conda-channel-archives" + ]; }; }; @@ -619,6 +627,13 @@ in index bogus_index_file; ''; }; + locations."/artiq-archives/" = { + alias = "${hydraWwwOutputs}/artiq-conda-channel-archives/"; + extraConfig = '' + autoindex on; + index bogus_index_file; + ''; + }; }; "git.m-labs.hk" = { forceSSL = true;