auxolotl/buildbot-nix
26
1
Fork 0
Code Issues Pull requests 1 Actions 1 Packages Projects Releases Wiki Activity

Make the webhook endpoint URL configurable

Browse source 
In some CI setups, the URL to access the CI server differs from the
URL that the (external) webhook endpoint listens on. This change
introduces an option webhookBaseUrl that allows setting that URL
independently from the buildbot installation URL.
This commit is contained in:
Andreas Fuchs 2024-05-08 11:15:31 -04:00 committed by mergify[bot]
parent e9a3849417
commit 760aec7e07
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nix/master.nix
View file

@ -181,6 +181,13 @@ in
example = "buildbot.numtide.com"; example = "buildbot.numtide.com";
}; };
webhookBaseUrl = lib.mkOption {
type = lib.types.str;
description = "URL base for the webhook endpoint that will be registered for github or gitea repos.";
example = "https://buildbot-webhooks.numtide.com/";
default = "${config.services.buildbot-master.buildbotUrl}";
};
outputsPath = lib.mkOption { outputsPath = lib.mkOption {
type = lib.types.nullOr lib.types.path; type = lib.types.nullOr lib.types.path;
description = "Path where we store the latest build store paths names for nix attributes as text files. This path will be exposed via nginx at \${domain}/nix-outputs"; description = "Path where we store the latest build store paths names for nix attributes as text files. This path will be exposed via nginx at \${domain}/nix-outputs";
@ -272,7 +279,7 @@ in
)" )"
}, },
admins=${builtins.toJSON cfg.admins}, admins=${builtins.toJSON cfg.admins},
url=${builtins.toJSON config.services.buildbot-master.buildbotUrl}, url=${builtins.toJSON config.services.buildbot-nix.master.webhookBaseUrl},
nix_eval_max_memory_size=${builtins.toJSON cfg.evalMaxMemorySize}, nix_eval_max_memory_size=${builtins.toJSON cfg.evalMaxMemorySize},
nix_eval_worker_count=${ nix_eval_worker_count=${
if cfg.evalWorkerCount == null then "None" else builtins.toString cfg.evalWorkerCount if cfg.evalWorkerCount == null then "None" else builtins.toString cfg.evalWorkerCount