Skip to content

Commit

Permalink
removed removing ros2_controllers | changed workflow to jazzy
Browse files Browse the repository at this point in the history
Signed-off-by: Jakub Delicat <jakub.delicat@husarion.com>
  • Loading branch information
delihus committed Jul 22, 2024
1 parent 1c00efc commit 7dd45c9
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 16 deletions.
12 changes: 2 additions & 10 deletions .github/workflows/ros-docker-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,11 @@ jobs:
- dockerfile: Dockerfile.hardware
repo_name: ''
platforms: linux/amd64, linux/arm64
ros_distro: humble
ros_distro: jazzy
- dockerfile: Dockerfile.gazebo
repo_name: rosbot-gazebo
platforms: linux/amd64
ros_distro: humble
- dockerfile: Dockerfile.hardware
repo_name: ''
platforms: linux/amd64, linux/arm64
ros_distro: iron
# - dockerfile: Dockerfile.gazebo
# repo_name: rosbot-gazebo
# platforms: linux/amd64
# ros_distro: iron
ros_distro: jazzy

steps:

Expand Down
3 changes: 0 additions & 3 deletions Dockerfile.gazebo
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ RUN apt-get update --fix-missing && apt-get install -y \
git clone --depth 1 -b jazzy-devel https://github.com/husarion/rosbot_ros.git src && \
vcs import src < src/rosbot/rosbot_hardware.repos && \
vcs import src < src/rosbot/rosbot_simulation.repos && \
cp -r src/ros2_controllers/diff_drive_controller src/ && \
cp -r src/ros2_controllers/imu_sensor_broadcaster src/ && \
rm -rf src/ros2_controllers && \
# Install dependencies
rm -rf /etc/ros/rosdep/sources.list.d/20-default.list && \
rosdep init && \
Expand Down
3 changes: 0 additions & 3 deletions Dockerfile.hardware
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ RUN apt-get update && apt-get install -y \

RUN git clone --depth 1 -b jazzy-devel https://github.com/husarion/rosbot_ros.git src && \
vcs import src < src/rosbot/rosbot_hardware.repos && \
cp -r src/ros2_controllers/diff_drive_controller src/ && \
cp -r src/ros2_controllers/imu_sensor_broadcaster src/ && \
rm -rf src/ros2_controllers && \
# it is necessary to remove simulation - otherwise rosdep tries to install dependencies
rm -r src/rosbot_gazebo && \
# without this line (using vulcanexus base image) rosdep init throws error: "ERROR: default sources list file already exists:"
Expand Down

0 comments on commit 7dd45c9

Please sign in to comment.