Skip to content

Commit d7de180

Browse files
Add --cmake-args option for ros-ci-for-pr (#11)
* Add --cmake-args option for ros-ci-for-pr Signed-off-by: Michael Orlov <michael.orlov@apex.ai> * Address review comment by removing -D prefix for parsed.cmake_args Signed-off-by: Michael Orlov <michael.orlov@apex.ai> --------- Signed-off-by: Michael Orlov <michael.orlov@apex.ai>
1 parent a9ef25b commit d7de180

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

ros_github_scripts/ci_for_pr.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,10 @@ def parse_args():
341341
parser.add_argument(
342342
'--colcon-test-args', type=str, default='',
343343
help='Arbitrary colcon arguments to specify to test; must be specified with -b')
344+
parser.add_argument(
345+
'--cmake-args', type=str, default='',
346+
help='Arbitrary CMake arguments to specify to build; Each argument shall be prefixed'
347+
' with -D. CMake arguments shall only be used with -b --build option.')
344348
return parser.parse_args()
345349

346350

@@ -365,8 +369,9 @@ def main():
365369
gist = create_ci_gist(github_instance, chosen_pulls, parsed.target)
366370
gist_url = gist.files['ros2.repos'].raw_url
367371

368-
if not parsed.build and (parsed.colcon_build_args or parsed.colcon_test_args):
369-
panic('colcon build or test args can only be specified when doing a build')
372+
if not parsed.build and \
373+
(parsed.colcon_build_args or parsed.colcon_test_args or parsed.cmake_args):
374+
panic('colcon build, cmake or test args can only be specified when doing a build')
370375

371376
extra_build_args = parsed.colcon_build_args
372377
extra_test_args = parsed.colcon_test_args
@@ -379,6 +384,9 @@ def main():
379384
extra_build_args += f' --packages-above-and-dependencies {packages_changed}'
380385
extra_test_args += f' --packages-above {packages_changed}'
381386

387+
if parsed.cmake_args:
388+
extra_build_args += f' --cmake-args {parsed.cmake_args}'
389+
382390
comment_texts = []
383391
comment_texts.append(
384392
format_ci_details(

0 commit comments

Comments
 (0)