Merge pull request #10 from Greenroom-Robotics/feature/stdout-disappe…

…aring * fix: stdout disappearing while building * fix: correct way to specify cores
Greenroom-Robotics · Dec 11, 2024 · 84462ee · 84462ee
2 parents 375356f + 3f201d1
commit 84462ee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/platform_cli/groups/packaging.py b/platform_cli/groups/packaging.py
@@ -251,9 +251,8 @@ def build(version: str, output: str, no_tests: bool):  # type: ignore reportUnus
             bloom_args += " --ignore-shlibs-missing-info"
 
             call(f"bloom-generate {pkg_type} --ros-distro {get_ros_distro()} {bloom_args}")
-
-            cpus = cpu_count() if cpu_count() else 1
-            call(f"fakeroot debian/rules binary -j{cpus}")
+            cores = cpu_count() if cpu_count() else 1
+            call(f"DEB_BUILD_OPTIONS=parallel={cores} fakeroot debian/rules binary")
 
             # the .deb and .ddeb files are in the parent directory
             # move .deb/.ddeb files into the output folder

diff --git a/platform_cli/groups/release.py b/platform_cli/groups/release.py
@@ -357,16 +357,17 @@ def _build_deb_in_docker(
             docker_image_name_with_digest,
             [
                 "/bin/bash",
+                "-l",
                 "-c",
-                f"source /home/ros/.profile && platform pkg build --version {version} --output {DEBS_DIRECTORY} && platform pkg clean",
+                f"platform pkg build --version {version} --output {DEBS_DIRECTORY} && platform pkg clean",
             ],
-            interactive=True,
             workdir=docker_working_dir,
             volumes=[
                 # We only mount the /debs directory for each package
                 (host_debs_path, docker_debs_path)
             ],
             platform=docker_plaform,
+            tty=True,
         )
 
     def create(self, cli: click.Group):