build: Build all cargo executables at once

Author: def-

ci/builder/Dockerfile

@@ -172,7 +172,7 @@ RUN mkdir rust \
     && `: Until https://github.com/est31/cargo-udeps/pull/147 is released in cargo-udeps` \
     && cargo install --root /usr/local --git https://github.com/est31/cargo-udeps --rev=b84d478ef3efd7264dba8c15c31a50c6399dc5bb --locked cargo-udeps --features=vendored-openssl \
     && cargo install --root /usr/local --version "=0.2.15" --no-default-features --features=s3,openssl/vendored sccache \
-    && cargo install --root /usr/local --version "=0.3.6" cargo-binutils
+    && cargo install --root /usr/local --version "=0.3.6" cargo-binutils \
 
 # Link the system lld into the cross-compiling sysroot.
 

misc/python/materialize/mzbuild.py

@@ -302,8 +302,28 @@ def extra(self) -> str:
         return ",".join(flags)
 
 
+def generate_cargo_build_command(
+    bins: List[str],
+    examples: List[str],
+    rd: RepositoryDetails,
+) -> List[str]:
+    rustflags = rustc_flags.coverage if rd.coverage else []
+
+    cargo_build = [*rd.cargo("build", channel=None, rustflags=rustflags)]
+
+    for bin in bins:
+        cargo_build.extend(["--bin", bin])
+    for example in examples:
+        cargo_build.extend(["--example", example])
+
+    if rd.release_mode:
+        cargo_build.append("--release")
+
+    return cargo_build
+
+
 class CargoBuild(CargoPreImage):
-    """A pre-image action that builds a single binary with Cargo."""
+    """A pre-image action that builds individual binaries with Cargo."""
 
     def __init__(self, rd: RepositoryDetails, path: Path, config: Dict[str, Any]):
         super().__init__(rd, path)
@@ -314,26 +334,10 @@ def __init__(self, rd: RepositoryDetails, path: Path, config: Dict[str, Any]):
         self.strip = config.pop("strip", True)
         self.split_debuginfo = config.pop("split_debuginfo", False)
         self.extract = config.pop("extract", {})
-        self.rustflags = config.pop("rustflags", [])
-        self.channel = None
-        if rd.coverage:
-            self.rustflags += rustc_flags.coverage
         if len(self.bins) == 0 and len(self.examples) == 0:
             raise ValueError("mzbuild config is missing pre-build target")
 
     def build(self) -> None:
-        cargo_build = [
-            *self.rd.cargo("build", channel=self.channel, rustflags=self.rustflags)
-        ]
-
-        for bin in self.bins:
-            cargo_build.extend(["--bin", bin])
-        for example in self.examples:
-            cargo_build.extend(["--example", example])
-
-        if self.rd.release_mode:
-            cargo_build.append("--release")
-        spawn.runv(cargo_build, cwd=self.rd.root)
         cargo_profile = "release" if self.rd.release_mode else "debug"
 
         def copy(exe: Path) -> None:
@@ -392,6 +396,10 @@ def copy(exe: Path) -> None:
             copy(Path("examples") / example)
 
         if self.extract:
+            cargo_build = generate_cargo_build_command(
+                self.bins, self.examples, self.rd
+            )
+
             output = spawn.capture(
                 cargo_build + ["--message-format=json"],
                 cwd=self.rd.root,
@@ -584,6 +592,16 @@ def build(self) -> None:
         for dep in self.dependencies.values():
             dep.acquire()
         spawn.runv(["git", "clean", "-ffdX", self.image.path])
+        bins = []
+        examples = []
+        for pre_image in self.image.pre_images:
+            if isinstance(pre_image, CargoBuild):
+                bins.extend(pre_image.bins)
+                examples.extend(pre_image.examples)
+
+        cargo_build = generate_cargo_build_command(bins, examples, self.image.rd)
+        spawn.runv(cargo_build, cwd=self.image.rd.root)
+
         for pre_image in self.image.pre_images:
             pre_image.run()
         build_args = {