From 408a2c56fc4c5d94de5720e31862a2694ad27514 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Mon, 4 May 2020 22:09:38 -0700 Subject: [PATCH 01/13] Update Dockerfile --- Dockerfile | 63 +++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9ac07102cac..db9d6b598de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,32 +7,34 @@ # --build-arg UNDERLAY_MIXINS \ # --build-arg OVERLAY_MIXINS ./ ARG FROM_IMAGE=osrf/ros2:nightly +ARG UNDERLAY_WS=/opt/underlay_ws +ARG OVERLAY_WS=/opt/overlay_ws # multi-stage for caching -FROM $FROM_IMAGE AS cache +FROM $FROM_IMAGE AS cacher # clone underlay source -ENV UNDERLAY_WS /opt/underlay_ws -RUN mkdir -p $UNDERLAY_WS/src -WORKDIR $UNDERLAY_WS -COPY ./tools/ros2_dependencies.repos ./ -RUN vcs import src < ros2_dependencies.repos +ARG UNDERLAY_WS +WORKDIR $UNDERLAY_WS/src +COPY ./tools/ros2_dependencies.repos ../ +RUN vcs import ./ < ../ros2_dependencies.repos && \ + find ./ -name ".git" | xargs rm -rf # copy overlay source -ENV OVERLAY_WS /opt/overlay_ws -RUN mkdir -p $OVERLAY_WS/src -WORKDIR $OVERLAY_WS -COPY ./ src/navigation2 +ARG OVERLAY_WS +WORKDIR $OVERLAY_WS/src +COPY ./ ./navigation2 # copy manifests for caching WORKDIR /opt -RUN find ./ -name "package.xml" | \ - xargs cp --parents -t /tmp && \ +RUN mkdir -p /tmp/opt && \ + find ./ -name "package.xml" | \ + xargs cp --parents -t /tmp/opt && \ find ./ -name "COLCON_IGNORE" | \ - xargs cp --parents -t /tmp + xargs cp --parents -t /tmp/opt || true # multi-stage for building -FROM $FROM_IMAGE AS build +FROM $FROM_IMAGE AS builder # install CI dependencies RUN apt-get update && apt-get install -q -y \ @@ -40,63 +42,56 @@ RUN apt-get update && apt-get install -q -y \ lcov \ && rm -rf /var/lib/apt/lists/* -# copy underlay manifests -ENV UNDERLAY_WS /opt/underlay_ws -COPY --from=cache /tmp/underlay_ws $UNDERLAY_WS -WORKDIR $UNDERLAY_WS - # install underlay dependencies +ARG UNDERLAY_WS +WORKDIR $UNDERLAY_WS +COPY --from=cacher /tmp/$UNDERLAY_WS/src ./src RUN . /opt/ros/$ROS_DISTRO/setup.sh && \ apt-get update && rosdep install -q -y \ --from-paths src \ --ignore-src \ && rm -rf /var/lib/apt/lists/* -# copy underlay source -COPY --from=cache $UNDERLAY_WS ./ - # build underlay source +COPY --from=cacher $UNDERLAY_WS/src ./src ARG UNDERLAY_MIXINS="release ccache" ARG FAIL_ON_BUILD_FAILURE=True RUN . /opt/ros/$ROS_DISTRO/setup.sh && \ colcon build \ --symlink-install \ - --mixin \ - $UNDERLAY_MIXINS \ + --mixin $UNDERLAY_MIXINS \ --event-handlers console_direct+ \ || touch build_failed && \ if [ -f build_failed ] && [ -n "$FAIL_ON_BUILD_FAILURE" ]; then \ exit 1; \ fi -# copy overlay manifests -ENV OVERLAY_WS /opt/overlay_ws -COPY --from=cache /tmp/overlay_ws $OVERLAY_WS -WORKDIR $OVERLAY_WS - # install overlay dependencies +ARG OVERLAY_WS +WORKDIR $OVERLAY_WS +COPY --from=cacher /tmp/$OVERLAY_WS/src ./src RUN . $UNDERLAY_WS/install/setup.sh && \ apt-get update && rosdep install -q -y \ --from-paths src \ + $UNDERLAY_WS/src \ --ignore-src \ && rm -rf /var/lib/apt/lists/* -# copy overlay source -COPY --from=cache $OVERLAY_WS ./ - # build overlay source +COPY --from=cacher $OVERLAY_WS/src ./src ARG OVERLAY_MIXINS="release ccache" RUN . $UNDERLAY_WS/install/setup.sh && \ colcon build \ --symlink-install \ - --mixin \ - $OVERLAY_MIXINS \ + --mixin $OVERLAY_MIXINS \ || touch build_failed && \ if [ -f build_failed ] && [ -n "$FAIL_ON_BUILD_FAILURE" ]; then \ exit 1; \ fi # source overlay from entrypoint +ENV UNDERLAY_WS $UNDERLAY_WS +ENV OVERLAY_WS $OVERLAY_WS RUN sed --in-place \ 's|^source .*|source "$OVERLAY_WS/install/setup.bash"|' \ /ros_entrypoint.sh From 60da5f13daa6b71a28b4637c9d6e9444f38f869f Mon Sep 17 00:00:00 2001 From: ruffsl Date: Mon, 4 May 2020 22:15:51 -0700 Subject: [PATCH 02/13] Update repo paths --- tools/ros2_dependencies.repos | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/ros2_dependencies.repos b/tools/ros2_dependencies.repos index b10c8af63ae..b6645197b0f 100644 --- a/tools/ros2_dependencies.repos +++ b/tools/ros2_dependencies.repos @@ -1,21 +1,21 @@ repositories: - BehaviorTree.CPP: + BehaviorTree/BehaviorTree.CPP: type: git url: https://github.com/BehaviorTree/BehaviorTree.CPP.git version: master - angles: + ros/angles: type: git url: https://github.com/ros/angles.git version: ros2 - gazebo_ros_pkgs: + ros-simulation/gazebo_ros_pkgs: type: git url: https://github.com/ros-simulation/gazebo_ros_pkgs.git version: ros2 - image_common: + ros-perception/image_common: type: git url: https://github.com/ros-perception/image_common.git version: ros2 - vision_opencv: + ros-perception/vision_opencv: type: git url: https://github.com/ros-perception/vision_opencv.git version: ros2 From 88f4856b28a5671567832ea46eb58005a3b84ca4 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Mon, 4 May 2020 22:26:44 -0700 Subject: [PATCH 03/13] Copy all of workspaceto include .repo files expected by CI in image --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index db9d6b598de..db641e1a653 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,7 +45,7 @@ RUN apt-get update && apt-get install -q -y \ # install underlay dependencies ARG UNDERLAY_WS WORKDIR $UNDERLAY_WS -COPY --from=cacher /tmp/$UNDERLAY_WS/src ./src +COPY --from=cacher /tmp/$UNDERLAY_WS ./ RUN . /opt/ros/$ROS_DISTRO/setup.sh && \ apt-get update && rosdep install -q -y \ --from-paths src \ @@ -53,7 +53,7 @@ RUN . /opt/ros/$ROS_DISTRO/setup.sh && \ && rm -rf /var/lib/apt/lists/* # build underlay source -COPY --from=cacher $UNDERLAY_WS/src ./src +COPY --from=cacher $UNDERLAY_WS ./ ARG UNDERLAY_MIXINS="release ccache" ARG FAIL_ON_BUILD_FAILURE=True RUN . /opt/ros/$ROS_DISTRO/setup.sh && \ @@ -69,7 +69,7 @@ RUN . /opt/ros/$ROS_DISTRO/setup.sh && \ # install overlay dependencies ARG OVERLAY_WS WORKDIR $OVERLAY_WS -COPY --from=cacher /tmp/$OVERLAY_WS/src ./src +COPY --from=cacher /tmp/$OVERLAY_WS ./ RUN . $UNDERLAY_WS/install/setup.sh && \ apt-get update && rosdep install -q -y \ --from-paths src \ @@ -78,7 +78,7 @@ RUN . $UNDERLAY_WS/install/setup.sh && \ && rm -rf /var/lib/apt/lists/* # build overlay source -COPY --from=cacher $OVERLAY_WS/src ./src +COPY --from=cacher $OVERLAY_WS ./ ARG OVERLAY_MIXINS="release ccache" RUN . $UNDERLAY_WS/install/setup.sh && \ colcon build \ From 881dd700b7b14d93ba3c4bedcecbcffa3491736b Mon Sep 17 00:00:00 2001 From: ruffsl Date: Mon, 4 May 2020 22:53:05 -0700 Subject: [PATCH 04/13] Patch Docker and CI for missing gazebo 11 Revert once gazebo 11 is ready --- .circleci/config.yml | 4 ++++ Dockerfile | 21 +++++++++++++++++++++ tools/ros2_dependencies.repos | 5 ++++- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a54fe5d281d..4a7fa256fde 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -74,6 +74,10 @@ references: rosdep install -q -y \ --from-paths src \ --ignore-src \ + --skip-keys " \ + gazebo11 \ + libgazebo11-dev \ + " \ --verbose | \ awk '$1 ~ /^resolution\:/' | \ awk -F'[][]' '{print $2}' | \ diff --git a/Dockerfile b/Dockerfile index db641e1a653..41864885202 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,6 +42,19 @@ RUN apt-get update && apt-get install -q -y \ lcov \ && rm -rf /var/lib/apt/lists/* +# TODO: clean up once libgazebo11-dev released into ros2 repo +# https://github.com/ros-infrastructure/reprepro-updater/pull/75 +# https://github.com/ros/rosdistro/pull/24646 +# setup keys +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys D2486D2DD83DB69272AFE98867170598AF249743 +# setup sources.list +RUN . /etc/os-release \ + && echo "deb http://packages.osrfoundation.org/gazebo/$ID-stable `lsb_release -sc` main" > /etc/apt/sources.list.d/gazebo-latest.list +# install gazebo packages +RUN apt-get update && apt-get install -q -y --no-install-recommends \ + libgazebo11-dev \ + && rm -rf /var/lib/apt/lists/* + # install underlay dependencies ARG UNDERLAY_WS WORKDIR $UNDERLAY_WS @@ -50,6 +63,10 @@ RUN . /opt/ros/$ROS_DISTRO/setup.sh && \ apt-get update && rosdep install -q -y \ --from-paths src \ --ignore-src \ + --skip-keys " \ + gazebo11 \ + libgazebo11-dev \ + " \ && rm -rf /var/lib/apt/lists/* # build underlay source @@ -75,6 +92,10 @@ RUN . $UNDERLAY_WS/install/setup.sh && \ --from-paths src \ $UNDERLAY_WS/src \ --ignore-src \ + --skip-keys " \ + gazebo11 \ + libgazebo11-dev \ + " \ && rm -rf /var/lib/apt/lists/* # build overlay source diff --git a/tools/ros2_dependencies.repos b/tools/ros2_dependencies.repos index b6645197b0f..df9e1a177aa 100644 --- a/tools/ros2_dependencies.repos +++ b/tools/ros2_dependencies.repos @@ -10,7 +10,10 @@ repositories: ros-simulation/gazebo_ros_pkgs: type: git url: https://github.com/ros-simulation/gazebo_ros_pkgs.git - version: ros2 + # TODO: Revert after support for Gazebo v11 is merged + # https://github.com/ros-simulation/gazebo_ros_pkgs/pull/1093 + # version: ros2 + version: gazebo11_foxy ros-perception/image_common: type: git url: https://github.com/ros-perception/image_common.git From 3311fd8a4a5cd4a851c769b02a2ed09b565fed6e Mon Sep 17 00:00:00 2001 From: ruffsl Date: Tue, 5 May 2020 15:12:31 -0700 Subject: [PATCH 05/13] Disable connext for now --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4a7fa256fde..490c9b89bfa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -402,9 +402,9 @@ workflows: requires: - debug_build - release_build - - test_rmw_connext_cpp: - requires: - - release_build + # - test_rmw_connext_cpp: + # requires: + # - release_build - test_rmw_cyclonedds_cpp: requires: - release_build From e6934f2ec7f82c69b8c9d49739721d18b16af789 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Tue, 5 May 2020 15:13:24 -0700 Subject: [PATCH 06/13] Disable debug jobs in nightly workflow --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 490c9b89bfa..4b78990026b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -397,10 +397,10 @@ workflows: - release_build nightly: jobs: - - debug_build - - debug_test: - requires: - - debug_build + # - debug_build + # - debug_test: + # requires: + # - debug_build - release_build # - test_rmw_connext_cpp: # requires: From 97db5de7a367670890a01776e3a0bb5fe6671c39 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Tue, 5 May 2020 15:20:05 -0700 Subject: [PATCH 07/13] Remove unused install_deployment_key refrence --- .circleci/config.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4b78990026b..ec6a46b682e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -280,10 +280,6 @@ references: file: lcov/project_coverage.info flags: project when: always - install_deployment_key: &install_deployment_key - add_ssh_keys: - fingerprints: - - "0e:8e:90:bf:3d:a9:04:d9:04:b4:62:38:a5:3b:90:7d" commands: <<: *common_commands From e3fc4e1e91936026d8d8616bc20b5d629fcf490f Mon Sep 17 00:00:00 2001 From: ruffsl Date: Fri, 8 May 2020 17:05:26 -0700 Subject: [PATCH 08/13] Update the release Dockerfile --- release_branch.Dockerfile | 46 +++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/release_branch.Dockerfile b/release_branch.Dockerfile index 3a03113420b..33b0ccddcb4 100644 --- a/release_branch.Dockerfile +++ b/release_branch.Dockerfile @@ -2,42 +2,42 @@ # It also expects to be contained in the /navigation2 root folder for file copy # # Example build command: -# export CMAKE_BUILD_TYPE=Debug +# export FROM_IMAGE="ros:foxy" +# export OVERLAY_MIXINS="release ccache" # docker build -t nav2:release_branch \ -# --build-arg FROM_IMAGE=dashing \ -# --build-arg CMAKE_BUILD_TYPE \ +# --build-arg FROM_IMAGE \ +# --build-arg OVERLAY_MIXINS \ # -f Dockerfile.release_branch ./ -ARG FROM_IMAGE=dashing -FROM ros:$FROM_IMAGE +ARG FROM_IMAGE=ros:foxy +ARG OVERLAY_WS=/opt/overlay_ws + +FROM $FROM_IMAGE RUN rosdep update -# copy ros package repo -ENV NAV2_WS /opt/nav2_ws -RUN mkdir -p $NAV2_WS/src -WORKDIR $NAV2_WS/src -COPY ./ navigation2/ +# copy overlay source +ARG OVERLAY_WS +WORKDIR $OVERLAY_WS/src +COPY ./ ./navigation2 -# install navigation2 package dependencies -WORKDIR $NAV2_WS +# install overlay dependencies +WORKDIR $OVERLAY_WS RUN . /opt/ros/$ROS_DISTRO/setup.sh && \ - apt-get update && \ - rosdep install -q -y \ - --from-paths \ - src \ + apt-get update && rosdep install -q -y \ + --from-paths src \ --ignore-src \ && rm -rf /var/lib/apt/lists/* -# build navigation2 package source -ARG CMAKE_BUILD_TYPE=Release +# build overlay source +ARG OVERLAY_MIXINS="release ccache" RUN . /opt/ros/$ROS_DISTRO/setup.sh && \ colcon build \ --symlink-install \ - --cmake-args \ - -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE + --mixin $OVERLAY_MIXINS -# source navigation2 workspace from entrypoint -RUN sed --in-place --expression \ - '$isource "$NAV2_WS/install/setup.bash"' \ +# source overlay from entrypoint +ENV OVERLAY_WS $OVERLAY_WS +RUN sed --in-place \ + 's|^source .*|source "$OVERLAY_WS/install/setup.bash"|' \ /ros_entrypoint.sh From 65807823fc8697ff0af632d9abe501dbb4c55522 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Fri, 8 May 2020 18:49:16 -0700 Subject: [PATCH 09/13] Use buildkit to speed up loacal builds --- release_branch.Dockerfile | 68 ++++++++++++++++++++++++++++++++------- 1 file changed, 57 insertions(+), 11 deletions(-) diff --git a/release_branch.Dockerfile b/release_branch.Dockerfile index 33b0ccddcb4..7e69821074f 100644 --- a/release_branch.Dockerfile +++ b/release_branch.Dockerfile @@ -1,41 +1,87 @@ -# This dockerfile expects proxies to be set via --build-arg if needed -# It also expects to be contained in the /navigation2 root folder for file copy +# syntax=docker/dockerfile:experimental + +# Use experimental buildkit for faster builds +# https://github.com/moby/buildkit/blob/master/frontend/dockerfile/docs/experimental.md +# Use `--progress=plain` to use plane stdout for docker build # # Example build command: -# export FROM_IMAGE="ros:foxy" +# export DOCKER_BUILDKIT=1 +# export FROM_IMAGE="ros:eloquent" # export OVERLAY_MIXINS="release ccache" # docker build -t nav2:release_branch \ # --build-arg FROM_IMAGE \ # --build-arg OVERLAY_MIXINS \ -# -f Dockerfile.release_branch ./ +# -f release_branch.Dockerfile ./ -ARG FROM_IMAGE=ros:foxy +ARG FROM_IMAGE=ros:eloquent ARG OVERLAY_WS=/opt/overlay_ws -FROM $FROM_IMAGE - -RUN rosdep update +# multi-stage for caching +FROM $FROM_IMAGE AS cacher # copy overlay source ARG OVERLAY_WS WORKDIR $OVERLAY_WS/src -COPY ./ ./navigation2 +RUN echo "\ +repositories: \n\ + ros-planning/navigation2: \n\ + type: git \n\ + url: https://github.com/ros-planning/navigation2.git \n\ + version: ${ROS_DISTRO}-devel \n\ +" > ../overlay.repos +RUN vcs import ./ < ../overlay.repos && \ + find ./ -name ".git" | xargs rm -rf +# COPY ./ ./ros-planning/navigation2 + +# copy manifests for caching +WORKDIR /opt +RUN mkdir -p /tmp/opt && \ + find ./ -name "package.xml" | \ + xargs cp --parents -t /tmp/opt && \ + find ./ -name "COLCON_IGNORE" | \ + xargs cp --parents -t /tmp/opt || true + +# multi-stage for building +FROM $FROM_IMAGE AS builder + +# edit apt for caching +RUN cp /etc/apt/apt.conf.d/docker-clean /etc/apt/ && \ + echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' \ + > /etc/apt/apt.conf.d/docker-clean + +# install CI dependencies +RUN --mount=type=cache,target=/var/cache/apt \ + --mount=type=cache,target=/var/lib/apt \ + apt-get update && apt-get install -q -y \ + ccache \ + lcov \ + && rosdep update # install overlay dependencies +ARG OVERLAY_WS WORKDIR $OVERLAY_WS -RUN . /opt/ros/$ROS_DISTRO/setup.sh && \ +COPY --from=cacher /tmp/$OVERLAY_WS/src ./src +RUN --mount=type=cache,target=/var/cache/apt \ + --mount=type=cache,target=/var/lib/apt \ + . /opt/ros/$ROS_DISTRO/setup.sh && \ apt-get update && rosdep install -q -y \ --from-paths src \ --ignore-src \ && rm -rf /var/lib/apt/lists/* # build overlay source +COPY --from=cacher $OVERLAY_WS/src ./src ARG OVERLAY_MIXINS="release ccache" -RUN . /opt/ros/$ROS_DISTRO/setup.sh && \ +RUN --mount=type=cache,target=/root/.ccache \ + . /opt/ros/$ROS_DISTRO/setup.sh && \ colcon build \ --symlink-install \ --mixin $OVERLAY_MIXINS +# restore apt for docker +RUN mv /etc/apt/docker-clean /etc/apt/apt.conf.d/ && \ + rm -rf /var/lib/apt/lists/ + # source overlay from entrypoint ENV OVERLAY_WS $OVERLAY_WS RUN sed --in-place \ From 9964c342e74dd18bd8857a798e8b59c96533f40f Mon Sep 17 00:00:00 2001 From: ruffsl Date: Fri, 8 May 2020 18:57:20 -0700 Subject: [PATCH 10/13] Add example of running tests --- release_branch.Dockerfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/release_branch.Dockerfile b/release_branch.Dockerfile index 7e69821074f..2b89b534008 100644 --- a/release_branch.Dockerfile +++ b/release_branch.Dockerfile @@ -87,3 +87,16 @@ ENV OVERLAY_WS $OVERLAY_WS RUN sed --in-place \ 's|^source .*|source "$OVERLAY_WS/install/setup.bash"|' \ /ros_entrypoint.sh + +# ARG RUN_TESTS +# ARG FAIL_ON_TEST_FAILURE +# RUN if [ -z "$RUN_TESTS" ]; then \ +# colcon test \ +# --mixin $OVERLAY_MIXINS \ +# --ctest-args --test-regex "test_.*"; \ +# if [ -z "$FAIL_ON_TEST_FAILURE" ]; then \ +# colcon test-result; \ +# else \ +# colcon test-result || true; \ +# fi \ +# fi From 301eb5435f531289514e0e21cd32c661868ccfc5 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Sat, 9 May 2020 13:12:23 -0700 Subject: [PATCH 11/13] Roll back BTcpp and no-error deprecated warnings --- .circleci/config.yml | 7 ++++++- Dockerfile | 5 +++++ tools/ros2_dependencies.repos | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ec6a46b682e..a761ae6c1b1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -120,7 +120,12 @@ references: rm -rf build install log colcon build \ --symlink-install \ - --mixin << parameters.mixins >> + --mixin << parameters.mixins >> \ + --cmake-args \ + --no-warn-unused-cli \ + -DCMAKE_CXX_FLAGS=" \ + -Wno-error=deprecated-declarations \ + " rm -f build_failed fi - save_to_cache: diff --git a/Dockerfile b/Dockerfile index 41864885202..414907e6ba8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -105,6 +105,11 @@ RUN . $UNDERLAY_WS/install/setup.sh && \ colcon build \ --symlink-install \ --mixin $OVERLAY_MIXINS \ + --cmake-args \ + --no-warn-unused-cli \ + -DCMAKE_CXX_FLAGS=" \ + -Wno-error=deprecated-declarations \ + " \ || touch build_failed && \ if [ -f build_failed ] && [ -n "$FAIL_ON_BUILD_FAILURE" ]; then \ exit 1; \ diff --git a/tools/ros2_dependencies.repos b/tools/ros2_dependencies.repos index df9e1a177aa..6d88c544c3f 100644 --- a/tools/ros2_dependencies.repos +++ b/tools/ros2_dependencies.repos @@ -2,7 +2,7 @@ repositories: BehaviorTree/BehaviorTree.CPP: type: git url: https://github.com/BehaviorTree/BehaviorTree.CPP.git - version: master + version: ros2-3.1.1 ros/angles: type: git url: https://github.com/ros/angles.git From 44b19c22c4d73d7d297ab7bb8d73c02c6fa0c495 Mon Sep 17 00:00:00 2001 From: ruffsl Date: Sat, 9 May 2020 13:51:37 -0700 Subject: [PATCH 12/13] Revert "Roll back BTcpp and no-error deprecated warnings" This reverts commit 301eb5435f531289514e0e21cd32c661868ccfc5. --- .circleci/config.yml | 7 +------ Dockerfile | 5 ----- tools/ros2_dependencies.repos | 2 +- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a761ae6c1b1..ec6a46b682e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -120,12 +120,7 @@ references: rm -rf build install log colcon build \ --symlink-install \ - --mixin << parameters.mixins >> \ - --cmake-args \ - --no-warn-unused-cli \ - -DCMAKE_CXX_FLAGS=" \ - -Wno-error=deprecated-declarations \ - " + --mixin << parameters.mixins >> rm -f build_failed fi - save_to_cache: diff --git a/Dockerfile b/Dockerfile index 414907e6ba8..41864885202 100644 --- a/Dockerfile +++ b/Dockerfile @@ -105,11 +105,6 @@ RUN . $UNDERLAY_WS/install/setup.sh && \ colcon build \ --symlink-install \ --mixin $OVERLAY_MIXINS \ - --cmake-args \ - --no-warn-unused-cli \ - -DCMAKE_CXX_FLAGS=" \ - -Wno-error=deprecated-declarations \ - " \ || touch build_failed && \ if [ -f build_failed ] && [ -n "$FAIL_ON_BUILD_FAILURE" ]; then \ exit 1; \ diff --git a/tools/ros2_dependencies.repos b/tools/ros2_dependencies.repos index 6d88c544c3f..df9e1a177aa 100644 --- a/tools/ros2_dependencies.repos +++ b/tools/ros2_dependencies.repos @@ -2,7 +2,7 @@ repositories: BehaviorTree/BehaviorTree.CPP: type: git url: https://github.com/BehaviorTree/BehaviorTree.CPP.git - version: ros2-3.1.1 + version: master ros/angles: type: git url: https://github.com/ros/angles.git From 3b775b0ca20d042b50929c68667d46e7bea1ee1f Mon Sep 17 00:00:00 2001 From: ruffsl Date: Sat, 9 May 2020 14:00:04 -0700 Subject: [PATCH 13/13] Move extra Dockerfiles to tools folder --- release_branch.Dockerfile => tools/release.Dockerfile | 0 full_ros_build.Dockerfile => tools/source.Dockerfile | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename release_branch.Dockerfile => tools/release.Dockerfile (100%) rename full_ros_build.Dockerfile => tools/source.Dockerfile (100%) diff --git a/release_branch.Dockerfile b/tools/release.Dockerfile similarity index 100% rename from release_branch.Dockerfile rename to tools/release.Dockerfile diff --git a/full_ros_build.Dockerfile b/tools/source.Dockerfile similarity index 100% rename from full_ros_build.Dockerfile rename to tools/source.Dockerfile