From 4acc8695e1224c92f7bb8eff5e9dc33e39593445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 4 Nov 2023 11:32:16 +0100 Subject: [PATCH 1/2] fix tmpfiles.rules for outputsPath --- nix/master.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/master.nix b/nix/master.nix index 59b0d30..c168386 100644 --- a/nix/master.nix +++ b/nix/master.nix @@ -209,6 +209,6 @@ in # Allow buildbot-master to write to this directory systemd.tmpfiles.rules = lib.optional (cfg.outputsPath != null) - "d ${cfg.outputPath} 0755 buildbot buildbot - -"; + "d ${cfg.outputsPath} 0755 buildbot buildbot - -"; }; } From 0e52cdf81f75bbd2c1d99017ed6c4db7c7f0b983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 4 Nov 2023 12:00:59 +0100 Subject: [PATCH 2/2] buildbot: set treeStableTimer Otherwise we build every commit --- buildbot_nix/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/buildbot_nix/__init__.py b/buildbot_nix/__init__.py index 20cbc94..3004f91 100644 --- a/buildbot_nix/__init__.py +++ b/buildbot_nix/__init__.py @@ -603,6 +603,7 @@ def config_for_project( == c.properties.getProperty("github.repository.default_branch"), ), builderNames=[f"{project.name}/nix-eval"], + treeStableTimer=5, ), # this is compatible with bors or github's merge queue schedulers.SingleBranchScheduler(