customize

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "python.analysis.typeCheckingMode": "basic"
+}

master.cfg

@@ -31,13 +31,13 @@ c["workers"] = [
     worker.Worker("worker-rust-1-65", "pass", properties={"rust_version": "1.65"}),
     worker.Worker("worker-rust-1-71", "pass", properties={"rust_version": "1.71"}),
 ]
-rust_workers = ["worker-rust-1-65"]
+rust_workers_1_65 = ["worker-rust-1-65"]
 
 if "BUILDBOT_MQ_URL" in os.environ:
     c["mq"] = {
         "type": "wamp",
         "router_url": os.environ["BUILDBOT_MQ_URL"],
-        "realm": os.environ.get("BUILDBOT_MQ_REALM", "buildbot").decode("utf-8"),
+        "realm": os.environ.get("BUILDBOT_MQ_REALM", "buildbot"),
         "debug": "BUILDBOT_MQ_DEBUG" in os.environ,
         "debug_websockets": "BUILDBOT_MQ_DEBUG" in os.environ,
         "debug_lowlevel": "BUILDBOT_MQ_DEBUG" in os.environ,
@@ -100,13 +100,14 @@ def basic_factory():
     return factory
 
 
-def append_factory(factory, name: str, workenames: list[str]):
+def append_factory(factory, name: str, workernames: list[str]):
     c["builders"].append(
-        util.BuilderConfig(name=name, workernames=workenames, factory=factory)
+        util.BuilderConfig(name=name, workernames=workernames, factory=factory)
     )
     builderNames.append(name)
 
 
+def cargo_test(name: str, workernames: list[str]):
     factory = basic_factory()
     factory.addStep(
         steps.ShellCommand(
@@ -114,8 +115,10 @@ factory.addStep(
             env=env,
         )
     )
-append_factory(factory, "cargo test", rust_workers)
+    append_factory(factory, name, workernames)
 
+
+def cargo_clippy(name: str, workernames: list[str]):
     factory = basic_factory()
     factory.addStep(
         steps.ShellCommand(
@@ -131,8 +134,26 @@ factory.addStep(
             env=env,
         )
     )
-append_factory(factory, "cargo clippy", rust_workers)
+    append_factory(factory, name, workernames)
 
+
+def cargo_fmt(name: str, workernames: list[str]):
+    factory = basic_factory()
+    factory.addStep(
+        steps.ShellCommand(
+            command=[
+                "cargo",
+                "fmt",
+                "--check",
+                "--all",
+            ],
+            env=env,
+        )
+    )
+    append_factory(factory, name, workernames)
+
+
+def cargo_doc(name: str, workernames: list[str], latest: bool):
     factory = basic_factory()
     factory.addStep(
         steps.ShellCommand(
@@ -155,6 +176,7 @@ factory.addStep(
             ),
         )
     )
+    if latest:
         factory.addStep(
             steps.DirectoryUpload(
                 workersrc=DOC_DIR,
@@ -162,21 +184,13 @@ factory.addStep(
                 url="https://radn.parrrate.ru/latest/docs/radn_rs/",
             )
         )
-append_factory(factory, "cargo doc", rust_workers)
+    append_factory(factory, name, workernames)
 
-factory = basic_factory()
+
-factory.addStep(
+cargo_test("cargo test (1.65)", rust_workers_1_65)
-    steps.ShellCommand(
+cargo_clippy("cargo clippy (1.65)", rust_workers_1_65)
-        command=[
+cargo_fmt("cargo fmt (1.65)", rust_workers_1_65)
-            "cargo",
+cargo_doc("cargo fmt (1.65)", rust_workers_1_65, True)
-            "fmt",
-            "--check",
-            "--all",
-        ],
-        env=env,
-    )
-)
-append_factory(factory, "cargo fmt", rust_workers)
 
 ####### SCHEDULERS