Luj/snowfield
1
0
Fork 0
mirror of https://github.com/JulienMalka/snowfield.git synced 2025-04-02 18:20:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed buildbot

Browse source
This commit is contained in:
Julien Malka 2023-01-20 01:59:06 +01:00
parent b90f365485
commit 290a57fcc5
Signed by: Luj
GPG key ID: 6FC74C847011FD83
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/buildbot/buildbot_nix.py
View file

@ -103,8 +103,7 @@ class NixEvalCommand(buildstep.ShellMixin, steps.BuildStep):
kwargs = self.setupShellMixin(kwargs) kwargs = self.setupShellMixin(kwargs)
super().__init__(**kwargs) super().__init__(**kwargs)
self.observer = logobserver.BufferLogObserver() self.observer = logobserver.BufferLogObserver()
self.addLogObserver("Eval trace", self.observer) self.addLogObserver("stdio", self.observer)
self.logEnviron = False
@defer.inlineCallbacks @defer.inlineCallbacks
def run(self) -> Generator[Any, object, Any]: 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 # if the command passes extract the list of stages
result = cmd.results() result = cmd.results()
print(f"RESULT: {result}")
if result == util.SUCCESS: if result == util.SUCCESS:
# create a ShellCommand for each stage and add them to the build # create a ShellCommand for each stage and add them to the build
jobs = [] jobs = []
@ -323,6 +321,7 @@ def nix_eval_config(
factory.addStep( factory.addStep(
NixEvalCommand( NixEvalCommand(
logEnviron = False,
env={}, env={},
name="Eval flake", name="Eval flake",
command=[ command=[

6
modules/buildbot/master.py
View file

@ -110,9 +110,6 @@ def build_config() -> dict[str, Any]:
credentials = os.environ.get("CREDENTIALS_DIRECTORY", ".") credentials = os.environ.get("CREDENTIALS_DIRECTORY", ".")
has_cachix_auth_token = False
has_cachix_signing_key = False
systemd_secrets = secrets.SecretInAFile(dirname=credentials) systemd_secrets = secrets.SecretInAFile(dirname=credentials)
c["secretsProviders"] = [systemd_secrets] c["secretsProviders"] = [systemd_secrets]
c["workers"] = [] c["workers"] = []
@ -130,9 +127,8 @@ def build_config() -> dict[str, Any]:
nix_eval_config( nix_eval_config(
[worker_names[0]], [worker_names[0]],
github_token_secret="github-token", 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( nix_update_flake_config(
worker_names, worker_names,
f"{ORG}/{REPO}", f"{ORG}/{REPO}",