From eb45b6f556d7b2aa38b4bc09e0875beaffc7e340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnaro=CC=88k?= Date: Sat, 16 Mar 2024 15:30:00 -0700 Subject: [PATCH] Mount rosdoc2 source directory read-only. Our deprecated out-of-tree build option has been removed which means that we now need to host our rosdoc2 sources in a read-write location to allow build artifacts to be generated in-tree. Mounting read-write shouldn't matter overmuch because we delete and re-clone rosdoc2 each time the job runs[1]. [1]: https://github.com/ros-infrastructure/ros_buildfarm/blob/f8d8219b7b7566dcccd6b95a7cb880962cdd816e/ros_buildfarm/templates/doc/rosdoc2_job.xml.em#L94 --- ros_buildfarm/scripts/doc/build_rosdoc2.py | 3 +-- ros_buildfarm/templates/doc/rosdoc2_job.xml.em | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ros_buildfarm/scripts/doc/build_rosdoc2.py b/ros_buildfarm/scripts/doc/build_rosdoc2.py index a66af9bad..25bb7cee5 100644 --- a/ros_buildfarm/scripts/doc/build_rosdoc2.py +++ b/ros_buildfarm/scripts/doc/build_rosdoc2.py @@ -49,8 +49,7 @@ def main(argv=sys.argv[1:]): '-m', 'pip', 'install', - '--no-warn-script-location', - '--use-deprecated=out-of-tree-build', + '--break-system-packages', '.'], cwd=args.rosdoc2_dir) if pip_rc: diff --git a/ros_buildfarm/templates/doc/rosdoc2_job.xml.em b/ros_buildfarm/templates/doc/rosdoc2_job.xml.em index d6654b91d..12de37440 100644 --- a/ros_buildfarm/templates/doc/rosdoc2_job.xml.em +++ b/ros_buildfarm/templates/doc/rosdoc2_job.xml.em @@ -146,7 +146,7 @@ else: ' --cidfile=$WORKSPACE/docker_generating_docker/docker.cid' + ' -e=HOME=/home/buildfarm' + ' -v $WORKSPACE/ros_buildfarm:/tmp/ros_buildfarm:ro' + - ' -v $WORKSPACE/rosdoc2:/tmp/rosdoc2:ro' + + ' -v $WORKSPACE/rosdoc2:/tmp/rosdoc2' + ' -v $WORKSPACE/ws:/tmp/ws' + ' -v $WORKSPACE/docker_doc:/tmp/docker_doc' + hgcache_mount_arg +