Skip to content

Commit

Permalink
Make the master branch colcon/catkin compatible
Browse files Browse the repository at this point in the history
  • Loading branch information
gergondet committed Feb 15, 2024
1 parent 8a07df4 commit d174213
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 4 deletions.
40 changes: 40 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: CI of mc_rtc_data

on:
push:
branches:
- '**'
pull_request:
branches:
- '**'

jobs:
build:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04, ubuntu-20.04]
variant: [ROS, Standalone]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
if: ${{ matrix.variant == 'Standalone' }}
with:
submodules: recursive
- name: Setup standalone build
if: ${{ matrix.variant == 'Standalone' }}
shell: bash
run: |
cp debian/CMakeLists.txt .
- name: Build standalone
if: ${{ matrix.variant == 'Standalone' }}
uses: jrl-umi3218/github-actions/build-cmake-project@master
with:
options: -DDISABLE_ROS=ON
- name: Build with catkin
if: ${{ matrix.os == 'ubuntu-20.04' && matrix.variant == 'ROS' }}
uses: jrl-umi3218/github-actions/build-catkin-project@master
- name: Build with colcon
if: ${{ matrix.os == 'ubuntu-22.04' && matrix.variant == 'ROS' }}
uses: jrl-umi3218/github-actions/build-colcon-project@master

12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ This package can be used as a ROS package.

# Installing

## Ubuntu LTS (16.04, 18.04, 20.04)
## Ubuntu LTS (18.04, 20.04, 22.04)

You must first setup our package mirror:

Expand Down Expand Up @@ -64,12 +64,16 @@ To compile you need the following tools and libraries:

### Building

Clone in your catkin/colcon workspace and build

To build outside of these checkout the [ROSFree](https://github.com/jrl-umi3218/mc_rtc_data/tree/ROSFree) branch or copy the CMakeLists.txt file in debian folder to the root folder first.

```sh
git clone --recursive https://github.com/jrl-umi3218/mc_rtc_data
mkdir mc_rtc_data/_build
cd mc_rtc_data/_build
cd mc_rtc_data
cp debian/CMakeLists.txt .
cd _build
cmake ..
make install
```

Or clone in your catkin workspace and build
File renamed without changes.
Empty file added debian/COLCON_IGNORE
Empty file.
1 change: 1 addition & 0 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ TMP = $(CURDIR)/debian/tmp
dh $@

override_dh_auto_configure:
cp $(CURDIR)/debian/CMakeLists.txt $(CURDIR)/
dh_auto_configure -- -DDISABLE_ROS=ON

override_dh_auto_install:
Expand Down
Empty file added mc_rtc_data/COLCON_IGNORE
Empty file.

0 comments on commit d174213

Please sign in to comment.