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

In catkin build, preserve original job list topological ordering #626

Merged
merged 1 commit into from
Feb 5, 2021
Merged

In catkin build, preserve original job list topological ordering #626

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 1 deletion catkin_tools/execution/executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,10 @@ def execute_jobs(
new_queued_jobs, pending_jobs = split(
pending_jobs,
lambda j: j.all_deps_completed(completed_jobs))
queued_jobs.extend(new_queued_jobs)
new_queued_jobs.extend(queued_jobs)

# queued jobs should preserve the original topological sort of jobs
queued_jobs = [j for j in jobs if j in new_queued_jobs]

# Notify of newly queued jobs
for queued_job in new_queued_jobs:
Expand Down