Skip to content

Commit

Permalink
Merge pull request iKrishneel#10 from tiiuae/use_galactic_default
Browse files Browse the repository at this point in the history
Use galactic as default build env, remove foxy from deb task
  • Loading branch information
mehmetkillioglu authored Feb 2, 2022
2 parents e20fbc4 + 6c521be commit d226eb7
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ros2_distro: [foxy, galactic]
ros2_distro: [galactic]
steps:

- name: Checkout octomap_server2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tii-octomap-server2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
tags: localhost:5000/tiiuae/octomap_server2:build_env
build-args: |
PACKAGE_NAME=octomap_server2
ROS_DISTRO=foxy
ROS_DISTRO=galactic
- name: Docker meta
id: meta
Expand Down Expand Up @@ -69,5 +69,5 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
build-args: |
PACKAGE_NAME=octomap_server2
ROS_DISTRO=foxy
ROS_DISTRO=galactic
FROM_IMAGE=localhost:5000/tiiuae/octomap_server2:build_env
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,7 @@ RUN sed --in-place \
chmod +x /$PACKAGE_NAME/entrypoint.sh

ENV PACKAGE_NAME $PACKAGE_NAME
ENV RMW_IMPLEMENTATION rmw_fastrtps_cpp

WORKDIR /$PACKAGE_NAME
ENTRYPOINT "/"$PACKAGE_NAME"/entrypoint.sh"
1 change: 1 addition & 0 deletions Dockerfile.build_env
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
fakeroot \
dh-make \
libboost-dev \
ros-${ROS_DISTRO}-rmw-fastrtps-cpp \
&& rm -rf /var/lib/apt/lists/*

RUN groupadd -g $GID builder && \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Port of the ROS1 [octomap server](https://github.com/OctoMap/octomap_mapping) fo
#### Installation
1. Firstly make sure you have [octomap](https://github.com/OctoMap/octomap.git) installed on your system
```bash
sudo apt-get install ros-foxy-octomap ros-foxy-octomap-msgs
sudo apt-get install ros-galactic-octomap ros-galactic-octomap-msgs
```

2. Next, clone this ros package to the appropriate ros2 workspace
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ git_version_string=${3:-$(git log --date=format:%Y%m%d --pretty=~git%cd.%h -n 1)

build_number=${GITHUB_RUN_NUMBER:=0}

ros_distro=${ROS_DISTRO:=foxy}
ros_distro=${ROS_DISTRO:=galactic}

iname=${PACKAGE_NAME:=octomap_server2}

Expand Down
2 changes: 1 addition & 1 deletion entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash

source /opt/ros/foxy/setup.bash
source /opt/ros/galactic/setup.bash
ros2 launch octomap_server2 octomap_server.py
6 changes: 3 additions & 3 deletions tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def clone(c):
'pull': "always attempt to pull a newer version of the image",
'ros_distro': "ROS distro to use (Available [foxy, galactic])"}
)
def build_env(c, nocache=False, pull=False, ros_distro="foxy", image_name=MODULE_NAME):
def build_env(c, nocache=False, pull=False, ros_distro="galactic", image_name=MODULE_NAME):
"""
Create Docker build environment.
"""
Expand Down Expand Up @@ -90,7 +90,7 @@ def clean(c, reallyclean=False):
help={'out_dir': "output directory for the generated deb files",
'ros_distro': "ROS distro to use (Available [foxy, galactic])"}
)
def create_deb_package(c, out_dir="../bin/", ros_distro="foxy", image_name=MODULE_NAME):
def create_deb_package(c, out_dir="../bin/", ros_distro="galactic", image_name=MODULE_NAME):
"""
Build debian package
"""
Expand All @@ -103,7 +103,7 @@ def create_deb_package(c, out_dir="../bin/", ros_distro="foxy", image_name=MODUL
'ros_distro': "ROS distro to use (Available [foxy, galactic])",
'image_name': "name of output docker image"}
)
def build_docker(c, nocache=False, pull=False, ros_distro="foxy", image_name=MODULE_NAME):
def build_docker(c, nocache=False, pull=False, ros_distro="galactic", image_name=MODULE_NAME):
"""
Build Docker image of this component
"""
Expand Down

0 comments on commit d226eb7

Please sign in to comment.