Skip to content

Commit f69a37a

Browse files
committed
relax concurrent builds
So far we cannot have builds running concurrently, whereas we only would need to be strict about nix evaluation to stay below memory limits.
1 parent 19ae8e8 commit f69a37a

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

buildbot_nix/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ def nix_eval_config(
357357
worker_names: list[str],
358358
github_token_secret: str,
359359
supported_systems: list[str],
360-
eval_lock: util.WorkerLock,
360+
eval_lock: util.MasterLock,
361361
worker_count: int,
362362
max_memory_size: int,
363363
) -> util.BuilderConfig:
@@ -581,7 +581,7 @@ def config_for_project(
581581
nix_supported_systems: list[str],
582582
nix_eval_worker_count: int,
583583
nix_eval_max_memory_size: int,
584-
eval_lock: util.WorkerLock,
584+
eval_lock: util.MasterLock,
585585
cachix: CachixConfig | None = None,
586586
outputs_path: Path | None = None,
587587
) -> Project:
@@ -646,7 +646,7 @@ def config_for_project(
646646
# This should prevent exessive memory usage.
647647
nix_eval_config(
648648
project,
649-
[worker_names[0]],
649+
worker_names,
650650
github_token_secret=github.token_secret_name,
651651
supported_systems=nix_supported_systems,
652652
worker_count=nix_eval_worker_count,
@@ -802,7 +802,7 @@ def configure(self, config: dict[str, Any]) -> None:
802802
worker_names.append(worker_name)
803803

804804
webhook_secret = read_secret_file(self.github.webhook_secret_name)
805-
eval_lock = util.WorkerLock("nix-eval")
805+
eval_lock = util.MasterLock("nix-eval")
806806

807807
for project in projects:
808808
create_project_hook(

0 commit comments

Comments
 (0)