Skip to content

Commit 4936e83

Browse files
authored
Merge pull request #445 from nix-community/various
postgresql.service -> postgresql.target, ruff fixes
2 parents 6a18f92 + 35f537a commit 4936e83

File tree

4 files changed

+10
-16
lines changed

4 files changed

+10
-16
lines changed

buildbot_effects/pyproject.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ ignore = [
4343
"ARG001",
4444
"ARG002",
4545

46-
# Missing type annotation for `self` in method
47-
"ANN101",
4846
# Dynamically typed expressions (typing.Any)
4947
"ANN401",
5048
# Trailing comma missing

buildbot_nix/buildbot_nix/__init__.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,6 @@ def nix_eval_config(
603603
env={},
604604
name="Evaluate effects",
605605
command=[
606-
# fmt: off
607606
"buildbot-effects",
608607
"--rev",
609608
util.Property("revision"),
@@ -612,7 +611,6 @@ def nix_eval_config(
612611
"--repo",
613612
util.Property("github.repository.html_url"),
614613
"list",
615-
# fmt: on
616614
],
617615
flunkOnFailure=True,
618616
# TODO: support other branches?
@@ -941,7 +939,6 @@ def buildbot_effects_config(
941939
steps.ShellCommand(
942940
name="Run effects",
943941
command=[
944-
# fmt: off
945942
"buildbot-effects",
946943
"--rev",
947944
util.Property("revision"),
@@ -953,7 +950,6 @@ def buildbot_effects_config(
953950
*secrets_args,
954951
"run",
955952
util.Property("command"),
956-
# fmt: on
957953
],
958954
logEnviron=False,
959955
),

flake.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nixosModules/master.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ in
804804
};
805805

806806
systemd.services.buildbot-master = {
807-
after = [ "postgresql.service" ];
807+
after = [ "postgresql.target" ];
808808
path = [ pkgs.openssl ];
809809
serviceConfig = {
810810
# in master.py we read secrets from $CREDENTIALS_DIRECTORY

0 commit comments

Comments
 (0)