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 catkin doc job #228

Merged
merged 2 commits into from
Mar 5, 2016
Merged

fix catkin doc job #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4fd416
check if setup file exists before using it
dirk-thomas Mar 4, 2016
8fa95d4
use same os_codename to generate Dockerfile for doc job
dirk-thomas Mar 5, 2016
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
10 changes: 8 additions & 2 deletions ros_buildfarm/templates/doc/doc_create_task.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# generated from @template_name

FROM ubuntu:trusty
FROM ubuntu:@os_code_name
MAINTAINER Dirk Thomas dthomas+buildfarm@@osrfoundation.org

VOLUME ["/var/cache/apt/archives"]
Expand All @@ -16,7 +16,7 @@ RUN useradd -u @uid -m buildfarm
'snippet/add_distribution_repositories.Dockerfile.em',
distribution_repository_keys=distribution_repository_keys,
distribution_repository_urls=distribution_repository_urls,
os_code_name='trusty',
os_code_name=os_code_name,
add_source=False,
))@

Expand All @@ -28,6 +28,12 @@ RUN useradd -u @uid -m buildfarm
# automatic invalidation once every day
RUN echo "@today_str"

@(TEMPLATE(
'snippet/install_python3.Dockerfile.em',
os_name=os_name,
os_code_name=os_code_name,
))@

RUN python3 -u /tmp/wrapper_scripts/apt-get.py update-and-install -q -y git mercurial python3-apt python3-catkin-pkg python3-empy python3-rosdep python3-rosdistro subversion

# always invalidate to actually have the latest apt and rosdep state
Expand Down
9 changes: 5 additions & 4 deletions scripts/doc/build_doc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,14 @@ def main(argv=sys.argv[1:]):
args.output_dir, 'symbols', '%s.tag' % pkg_name)

source_cmd = [
# for workspaces with only plain cmake packages the setup files
# generated by cmi won't implicitly source the underlays
'.', '/opt/ros/%s/setup.sh' % args.rosdistro_name,
'&&',
'.', os.path.join(
args.workspace_root, 'install_isolated', 'setup.sh'),
]
# for workspaces with only plain cmake packages the setup files
# generated by cmi won't implicitly source the underlays
setup_file = '/opt/ros/%s/setup.sh' % args.rosdistro_name
if os.path.exists(setup_file):
source_cmd = ['.', setup_file] + source_cmd
rosdoc_lite_cmd = [
os.path.join(args.rosdoc_lite_dir, 'scripts', 'rosdoc_lite'),
pkg_path,
Expand Down