From 1163cc1928452765b8b0bb60b374803f7fe644b0 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 20 Nov 2023 23:02:37 +0900 Subject: [PATCH] add install colcon mixin line (#326) * add install colcon mixin line Signed-off-by: Masaya Kataoka * update role Signed-off-by: Masaya Kataoka * remove redandant line Signed-off-by: Masaya Kataoka * install colcon via pip Signed-off-by: Masaya Kataoka * install via apt Signed-off-by: Masaya Kataoka --------- Signed-off-by: Masaya Kataoka --- ansible/roles/build/tasks/main.yml | 7 +++++++ ansible/roles/ros2/tasks/main.yml | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ansible/roles/build/tasks/main.yml b/ansible/roles/build/tasks/main.yml index 408dd83b1..ea03e47e2 100644 --- a/ansible/roles/build/tasks/main.yml +++ b/ansible/roles/build/tasks/main.yml @@ -45,6 +45,13 @@ command: rosdep install -y -r -i --from-paths {{ workspace_path }}/src --ignore-src --rosdistro humble become: yes +- name: add colcon mixin + command: colcon mixin add default https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml + ignore_errors: true + +- name: update colcon mixin + command: colcon mixin update default + - name: load env variable & build shell: |- cd {{ workspace_path }} diff --git a/ansible/roles/ros2/tasks/main.yml b/ansible/roles/ros2/tasks/main.yml index c2c36c2f4..aecd00c1e 100644 --- a/ansible/roles/ros2/tasks/main.yml +++ b/ansible/roles/ros2/tasks/main.yml @@ -60,7 +60,7 @@ # shell: apt-get -y update && apt-get -y upgrade && apt-get --with-new-pkgs -y upgrade && aptitude -y full-upgrade && apt-get -y update && apt-get -y upgrade # become: yes -- name: install ros2 humble/colcon/vcs +- name: install ros2 humble/vcs become: yes apt: name: "{{ packages }}" @@ -70,8 +70,8 @@ packages: - "{{ ros_package_name }}" - python3-colcon-common-extensions + - python3-colcon-mixin - python3-vcstool - - python3-colcon-common-extensions - python3-rospkg - python3-catkin-pkg - python3-rosdep