Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: stdout disappearing while building on runner #10

Merged
merged 3 commits into from
Dec 11, 2024
Merged

fix: stdout disappearing while building on runner #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d44d41
fix: attempt to fix stdout disappearing while building
russkel Dec 11, 2024
f018556
fix: maybe this is it
russkel Dec 11, 2024
3f201d1
fix: correct way to specify cores
russkel Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions platform_cli/groups/packaging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions platform_cli/groups/release.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
Loading