Skip to content

Commit ba8ec0e

Browse files
author
Kevin Jaget
authored
In catkin build, preserve original job list topological ordering when (#626)
moving jobs from pending to queued
1 parent e1d471a commit ba8ec0e

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

catkin_tools/execution/executor.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,10 @@ async def execute_jobs(
342342
new_queued_jobs, pending_jobs = split(
343343
pending_jobs,
344344
lambda j: j.all_deps_completed(completed_jobs))
345-
queued_jobs.extend(new_queued_jobs)
345+
new_queued_jobs.extend(queued_jobs)
346+
347+
# queued jobs should preserve the original topological sort of jobs
348+
queued_jobs = [j for j in jobs if j in new_queued_jobs]
346349

347350
# Notify of newly queued jobs
348351
for queued_job in new_queued_jobs:

0 commit comments

Comments
 (0)