Merge remote-tracking branch 'lass/master'

This commit is contained in:
makefu 2018-09-13 22:44:42 +02:00
commit 6c5d362662
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225

View File

@ -26,8 +26,8 @@ let
hostname = config.networking.hostName; hostname = config.networking.hostName;
getJobs = pkgs.writeDash "get_jobs" '' getJobs = pkgs.writeDash "get_jobs" ''
nix-build --no-out-link ./ci.nix 2>&1 > /dev/null nix-build --no-out-link --quiet -Q ./ci.nix > /dev/null
nix-instantiate --eval --strict --json ./ci.nix nix-instantiate --quiet -Q --eval --strict --json ./ci.nix
''; '';
imp = { imp = {
@ -53,9 +53,12 @@ let
nameValuePair name '' nameValuePair name ''
sched.append( sched.append(
schedulers.SingleBranchScheduler( schedulers.SingleBranchScheduler(
change_filter=util.ChangeFilter(branch_re=".*"), change_filter=util.ChangeFilter(
branch_re=".*",
project='${name}',
),
treeStableTimer=60, treeStableTimer=60,
name="build-all-branches", name="${name}-all-branches",
builderNames=[ builderNames=[
"${name}", "${name}",
] ]