clerie/nixfiles
1
0
Fork 0
Code

hosts/web-2: Publish mitel-ommclient2 documentation using update-from-hydra

Browse Source
This commit is contained in:
clerie 2023-09-09 14:15:24 +02:00
parent e515212708
commit e2f58fd25c
4 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hosts/web-2/configuration.nix
View File

@ -16,6 +16,7 @@
./legal.nix
./meow.nix
./milchinsel.nix
./mitel-ommclient2.nix
./ping.nix
./prediger.nix
./public.nix

20
hosts/web-2/mitel-ommclient2.nix Normal file
View File

@ -0,0 +1,20 @@
{ ... }: {
services.update-from-hydra.paths.mitel-ommclient2 = {
enable = true;
hydraUrl = "https://hydra.clerie.de";
hydraProject = "clerie";
hydraJobset = "mitel_ommclient2";
hydraJob = "packages.x86_64-linux.mitel-ommclient2";
buildOutput = "doc";
nixStoreUri = "https://nix-cache.clerie.de";
resultPath = "/srv/mitel-ommclient2";
};
services.nginx.virtualHosts = {
"mitel-ommclient2.clerie.de" = {
enableACME = true;
forceSSL = true;
root = "/srv/mitel-ommclient2/share/doc/mitel-ommclient2/html";
};
};
}

10
modules/update-from-hydra/default.nix
View File

@ -45,6 +45,14 @@ let
'';
};
buildOutput = mkOption {
type = with types; nullOr str;
default = null;
description = ''
Build output name
'';
};
nixStoreUri = mkOption {
type = types.str;
description = ''
@ -85,7 +93,7 @@ in {
wantedBy = [ "multi-user.target" ];
script = ''
${pkgs.update-from-hydra}/bin/update-from-hydra --hydra-url "${path.hydraUrl}" --hydra-project "${path.hydraProject}" --hydra-jobset "${path.hydraJobset}" --hydra-job "${path.hydraJob}" --nix-store-uri "${path.nixStoreUri}" --gcroot-name "${name}" "${path.resultPath}"
${pkgs.update-from-hydra}/bin/update-from-hydra --hydra-url "${path.hydraUrl}" --hydra-project "${path.hydraProject}" --hydra-jobset "${path.hydraJobset}" --hydra-job "${path.hydraJob}" ${optionalString (path.buildOutput != null) "--build-output ${path.buildOutput}"} --nix-store-uri "${path.nixStoreUri}" --gcroot-name "${name}" "${path.resultPath}"
'';
})
) cfg.paths);

11
pkgs/update-from-hydra/update-from-hydra.sh
View File

@ -2,6 +2,8 @@
set -euo pipefail
BUILD_OUTPUT="out"
while [[ $# -gt 0 ]]; do
case $1 in
--hydra-url)
@ -29,6 +31,11 @@ while [[ $# -gt 0 ]]; do
shift
shift
;;
--build-output)
BUILD_OUTPUT="$2"
shift
shift
;;
--gcroot-name)
GCROOT_NAME="$2"
shift
@ -50,13 +57,13 @@ set -- "${ARGS[@]}"
HYDRA_JOB_URL="${HYDRA_URL}/job/${HYDRA_PROJECT}/${HYDRA_JOBSET}/${HYDRA_JOB}/latest-finished"
RESULT_PATH="$1"
echo "Updating ${RESULT_PATH} from ${HYDRA_PROJECT}:${HYDRA_JOBSET}:${HYDRA_JOB}"
echo "Updating ${RESULT_PATH} from ${HYDRA_PROJECT}:${HYDRA_JOBSET}:${HYDRA_JOB} output ${BUILD_OUTPUT}"
echo "Make sure symlink directory exist"
mkdir -p "$(dirname "${RESULT_PATH}")"
echo "Fetching job output"
STORE_PATH="$(curl -s -L -H "Accept: application/json" "${HYDRA_JOB_URL}" | jq -r .buildoutputs.out.path)"
STORE_PATH="$(curl -s -L -H "Accept: application/json" "${HYDRA_JOB_URL}" | jq -r ".buildoutputs.${BUILD_OUTPUT}.path")"
echo "Copying path"
nix copy --from "${NIX_STORE_URI}" "${STORE_PATH}"