From 290a57fcc5e15fd12ff3285059542ebd666ff530 Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Fri, 20 Jan 2023 01:59:06 +0100
Subject: [PATCH] Fixed buildbot
---
modules/buildbot/buildbot_nix.py | 5 ++---
modules/buildbot/master.py | 6 +-----
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/modules/buildbot/buildbot_nix.py b/modules/buildbot/buildbot_nix.py
index 69e47c6..1155a08 100644
--- a/modules/buildbot/buildbot_nix.py
+++ b/modules/buildbot/buildbot_nix.py
@@ -103,8 +103,7 @@ class NixEvalCommand(buildstep.ShellMixin, steps.BuildStep):
kwargs = self.setupShellMixin(kwargs)
super().__init__(**kwargs)
self.observer = logobserver.BufferLogObserver()
- self.addLogObserver("Eval trace", self.observer)
- self.logEnviron = False
+ self.addLogObserver("stdio", self.observer)
@defer.inlineCallbacks
def run(self) -> Generator[Any, object, Any]:
@@ -114,7 +113,6 @@ class NixEvalCommand(buildstep.ShellMixin, steps.BuildStep):
# if the command passes extract the list of stages
result = cmd.results()
- print(f"RESULT: {result}")
if result == util.SUCCESS:
# create a ShellCommand for each stage and add them to the build
jobs = []
@@ -323,6 +321,7 @@ def nix_eval_config(
factory.addStep(
NixEvalCommand(
+ logEnviron = False,
env={},
name="Eval flake",
command=[
diff --git a/modules/buildbot/master.py b/modules/buildbot/master.py
index 1075379..7fa4d96 100644
--- a/modules/buildbot/master.py
+++ b/modules/buildbot/master.py
@@ -110,9 +110,6 @@ def build_config() -> dict[str, Any]:
credentials = os.environ.get("CREDENTIALS_DIRECTORY", ".")
- has_cachix_auth_token = False
- has_cachix_signing_key = False
-
systemd_secrets = secrets.SecretInAFile(dirname=credentials)
c["secretsProviders"] = [systemd_secrets]
c["workers"] = []
@@ -130,9 +127,8 @@ def build_config() -> dict[str, Any]:
nix_eval_config(
[worker_names[0]],
github_token_secret="github-token",
- automerge_users=[BUILDBOT_GITHUB_USER],
),
- nix_build_config(worker_names, has_cachix_auth_token, has_cachix_signing_key),
+ nix_build_config(worker_names),
nix_update_flake_config(
worker_names,
f"{ORG}/{REPO}",