From f2c8723bb8ad12abb6b9ec6d562acf7d64cc5fff Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 13 Sep 2018 14:41:26 +0200 Subject: ci: silence nix-build/nix-instantiate --- krebs/3modules/ci.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix index 33afb2c0a..37aef74ef 100644 --- a/krebs/3modules/ci.nix +++ b/krebs/3modules/ci.nix @@ -26,8 +26,8 @@ let hostname = config.networking.hostName; getJobs = pkgs.writeDash "get_jobs" '' - nix-build --no-out-link ./ci.nix 2>&1 > /dev/null - nix-instantiate --eval --strict --json ./ci.nix + nix-build --no-out-link --quiet -Q ./ci.nix > /dev/null + nix-instantiate --quiet -Q --eval --strict --json ./ci.nix ''; imp = { -- cgit v1.2.3 From 244d31c7611e26e9cac91af2e945910b38acee96 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 13 Sep 2018 14:41:58 +0200 Subject: ci: split schedulers by repo --- krebs/3modules/ci.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix index 37aef74ef..fdc8b9dc4 100644 --- a/krebs/3modules/ci.nix +++ b/krebs/3modules/ci.nix @@ -53,9 +53,12 @@ let nameValuePair name '' sched.append( schedulers.SingleBranchScheduler( - change_filter=util.ChangeFilter(branch_re=".*"), + change_filter=util.ChangeFilter( + branch_re=".*", + project='${name}', + ), treeStableTimer=60, - name="build-all-branches", + name="${name}-all-branches", builderNames=[ "${name}", ] -- cgit v1.2.3