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

Rolling ci with repos #2342

Closed
wants to merge 3 commits into from
Closed

Rolling ci with repos #2342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf0f115
Update Dockerfiles and Dockerhub to rolling
ruffsl May 14, 2021
0db21f3
Install RMWs as CI dependencies
ruffsl May 14, 2021
7d8afb2
Repalce deprecated headers of tf2_sensor_msgs
May 17, 2021
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
2 changes: 1 addition & 1 deletion .dockerhub/debug/hooks/build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -ex

export FROM_IMAGE=osrf/ros2:nightly
export FROM_IMAGE=ros:rolling
export FAIL_ON_BUILD_FAILURE=""
export UNDERLAY_MIXINS="release ccache"
export OVERLAY_MIXINS="debug ccache coverage-gcc"
Expand Down
6 changes: 3 additions & 3 deletions .dockerhub/distro.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
#
# Example build command:
# export DOCKER_BUILDKIT=1
# export FROM_IMAGE="ros:foxy"
# export FROM_IMAGE="ros:rolling"
# export OVERLAY_MIXINS="release ccache"
# docker build -t nav2:foxy \
# docker build -t nav2:rolling \
# --build-arg FROM_IMAGE \
# --build-arg OVERLAY_MIXINS \
# -f distro.Dockerfile ../

ARG FROM_IMAGE=ros:foxy
ARG FROM_IMAGE=ros:rolling
ARG OVERLAY_WS=/opt/overlay_ws

# multi-stage for caching
Expand Down
2 changes: 1 addition & 1 deletion .dockerhub/release/hooks/build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -ex

export FROM_IMAGE=osrf/ros2:nightly-rmw-nonfree
export FROM_IMAGE=ros:rolling
export FAIL_ON_BUILD_FAILURE=""
export UNDERLAY_MIXINS="release ccache"
export OVERLAY_MIXINS="release ccache"
Expand Down
8 changes: 6 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# docker build -t nav2:latest \
# --build-arg UNDERLAY_MIXINS \
# --build-arg OVERLAY_MIXINS ./
ARG FROM_IMAGE=osrf/ros2:nightly
ARG FROM_IMAGE=ros:rolling
ARG UNDERLAY_WS=/opt/underlay_ws
ARG OVERLAY_WS=/opt/overlay_ws

Expand Down Expand Up @@ -38,9 +38,13 @@ FROM $FROM_IMAGE AS builder
ARG DEBIAN_FRONTEND=noninteractive

# install CI dependencies
RUN apt-get update && apt-get install -q -y \
ARG RTI_NC_LICENSE_ACCEPTED=yes
RUN apt-get update && apt-get install -y \
ccache \
lcov \
ros-$ROS_DISTRO-rmw-fastrtps-cpp \
ros-$ROS_DISTRO-rmw-connextdds \
ros-$ROS_DISTRO-rmw-cyclonedds-cpp \
&& rosdep update \
&& rm -rf /var/lib/apt/lists/*

Expand Down
2 changes: 1 addition & 1 deletion nav2_costmap_2d/include/nav2_costmap_2d/observation_buffer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include "tf2_geometry_msgs/tf2_geometry_msgs.h"
#include "rclcpp/time.hpp"
#include "tf2_ros/buffer.h"
#include "tf2_sensor_msgs/tf2_sensor_msgs.h"
#include "tf2_sensor_msgs/tf2_sensor_msgs.hpp"
#include "sensor_msgs/msg/point_cloud2.hpp"
#include "nav2_costmap_2d/observation.hpp"
#include "nav2_util/lifecycle_node.hpp"
Expand Down