From b5fc817c9fc410bffbc4afdcb1bed10154da035e Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Thu, 12 Dec 2024 15:38:11 -0600 Subject: [PATCH] fixup! Plumb 'build_environment_variables' into doc jobs --- ros_buildfarm/templates/doc/doc_create_task.Dockerfile.em | 2 +- ros_buildfarm/templates/doc/rosdoc2_create_task.Dockerfile.em | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ros_buildfarm/templates/doc/doc_create_task.Dockerfile.em b/ros_buildfarm/templates/doc/doc_create_task.Dockerfile.em index a0ec51bb9..51f283116 100644 --- a/ros_buildfarm/templates/doc/doc_create_task.Dockerfile.em +++ b/ros_buildfarm/templates/doc/doc_create_task.Dockerfile.em @@ -76,7 +76,7 @@ cmds = [ ' --vcs-info "%s"' % vcs_info + \ ' --distribution-repository-urls ' + ' '.join(distribution_repository_urls) + \ ' --distribution-repository-key-files ' + ' ' .join(['/tmp/keys/%d.key' % i for i in range(len(distribution_repository_keys))]) + \ - ' --env-vars ' + ' ' .join(['%s=%s' % key_value for key_value in env_vars.items() + \ + ' --env-vars ' + ' ' .join(['%s=%s' % key_value for key_value in env_vars.items()]) + \ (' --force' if force else '') + \ ' --output-dir /tmp/generated_documentation' + \ ' --dockerfile-dir /tmp/docker_doc', diff --git a/ros_buildfarm/templates/doc/rosdoc2_create_task.Dockerfile.em b/ros_buildfarm/templates/doc/rosdoc2_create_task.Dockerfile.em index e7fd1903c..47ba72aac 100644 --- a/ros_buildfarm/templates/doc/rosdoc2_create_task.Dockerfile.em +++ b/ros_buildfarm/templates/doc/rosdoc2_create_task.Dockerfile.em @@ -58,7 +58,7 @@ cmds = [ ' --arch ' + arch + \ ' --distribution-repository-urls ' + ' '.join(distribution_repository_urls) + \ ' --distribution-repository-key-files ' + ' ' .join(['/tmp/keys/%d.key' % i for i in range(len(distribution_repository_keys))]) + \ - ' --env-vars ' + ' ' .join(['%s=%s' % key_value for key_value in env_vars.items() + \ + ' --env-vars ' + ' ' .join(['%s=%s' % key_value for key_value in env_vars.items()]) + \ ' --dockerfile-dir /tmp/docker_doc', ] }@