Skip to content
Merged
Changes from all commits
Commits
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
19 changes: 6 additions & 13 deletions src/taskgraph/run-task/run-task
Original file line number Diff line number Diff line change
Expand Up @@ -1340,21 +1340,14 @@ def main(args):
b"%s is %s\n" % (k.encode("utf-8"), os.environ[k].encode("utf-8")),
)

try:
if "MOZ_FETCHES" in os.environ:
fetch_artifacts()
if "MOZ_FETCHES" in os.environ:
fetch_artifacts()

# Install Python requirements after fetches in case tasks want to use
# fetches to grab dependencies.
install_pip_requirements(repositories)
# Install Python requirements after fetches in case tasks want to use
# fetches to grab dependencies.
install_pip_requirements(repositories)

return run_command(b"task", task_args, cwd=args.task_cwd)
finally:
fetches_dir = os.environ.get("MOZ_FETCHES_DIR")
if fetches_dir and os.path.isdir(fetches_dir):
print_line(b"fetches", b"removing %s\n" % fetches_dir.encode("utf-8"))
remove(fetches_dir)
print_line(b"fetches", b"finished\n")
return run_command(b"task", task_args, cwd=args.task_cwd)


if __name__ == "__main__":
Expand Down
Loading