Skip to content

Commit e331bc1

Browse files
authored
Merge pull request #79 from OctoMap/wxm-upgrade-ci-and-fix-buster
Update CI & look into Debian Buster dependency issues
2 parents 573e510 + e7c7b28 commit e331bc1

File tree

4 files changed

+52
-51
lines changed

4 files changed

+52
-51
lines changed
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# This config uses industrial_ci (https://github.com/ros-industrial/industrial_ci.git).
2+
# For troubleshooting, see readme (https://github.com/ros-industrial/industrial_ci/blob/master/README.rst)
3+
4+
name: CI
5+
6+
# This determines when this workflow is run
7+
on: [push, pull_request] # on all pushes and PRs
8+
9+
jobs:
10+
CI:
11+
strategy:
12+
matrix:
13+
env:
14+
- {ROS_DISTRO: kinetic}
15+
- {ROS_DISTRO: kinetic, PRERELEASE: true}
16+
- {ROS_DISTRO: melodic}
17+
- {ROS_DISTRO: melodic, PRERELEASE: true}
18+
- {ROS_DISTRO: noetic}
19+
- {ROS_DISTRO: noetic, PRERELEASE: true}
20+
- {ROS_DISTRO: noetic, OS_NAME: debian, OS_CODE_NAME: buster}
21+
env:
22+
CCACHE_DIR: /github/home/.ccache # Enable ccache
23+
PARALLEL_BUILDS: 4
24+
runs-on: ubuntu-latest
25+
steps:
26+
- uses: actions/checkout@v2
27+
# This step will fetch/store the directory used by ccache before/after the ci run
28+
- uses: actions/cache@v2
29+
with:
30+
path: ${{ env.CCACHE_DIR }}
31+
key: ccache-${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }}
32+
# Run industrial_ci
33+
- uses: 'ros-industrial/industrial_ci@master'
34+
env: ${{ matrix.env }}

.travis.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

README.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
octomap_mapping [![Build Status](https://travis-ci.org/OctoMap/octomap_mapping.svg?branch=kinetic-devel)](https://travis-ci.org/OctoMap/octomap_mapping)
1+
octomap_mapping ![CI](https://github.com/OctoMap/octomap_mapping/workflows/CI/badge.svg)
22
===============
33

44
ROS stack for mapping with OctoMap, contains the `octomap_server` package.
55

6-
The main branch for Kinetic, Melodic, and Noetic is `kinetic-devel`.
7-
8-
Indigo: [![Build Status](https://travis-ci.org/OctoMap/octomap_mapping.svg?branch=indigo-devel)](https://travis-ci.org/OctoMap/octomap_mapping)
9-
10-
Imported from SVN, see https://code.google.com/p/alufr-ros-pkg/ for the previous versions.
6+
The main branch for ROS Kinetic and newer is `kinetic-devel`.

octomap_server/package.xml

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<package>
1+
<package format="3">
22
<name>octomap_server</name>
33
<version>0.6.5</version>
44
<description>
@@ -10,7 +10,7 @@
1010
<url>http://www.ros.org/wiki/octomap_server</url>
1111
<url type="bugtracker">https://github.com/OctoMap/octomap_mapping/issues</url>
1212
<url type="repository">https://github.com/OctoMap/octomap_mapping</url>
13-
13+
1414
<export>
1515
<nodelet plugin="${prefix}/nodelet_plugins.xml" />
1616
<nodelet plugin="${prefix}/color_nodelet_plugins.xml" />
@@ -27,27 +27,22 @@
2727
<build_depend>std_msgs</build_depend>
2828
<build_depend>std_srvs</build_depend>
2929
<build_depend>octomap</build_depend>
30-
<build_depend>octomap_msgs</build_depend>
30+
<build_depend>octomap_msgs</build_depend>
3131
<build_depend>octomap_ros</build_depend>
3232
<build_depend>dynamic_reconfigure</build_depend>
3333
<build_depend>nodelet</build_depend>
34-
<build_depend>libpcl-all-dev</build_depend>
3534

36-
<run_depend>roscpp</run_depend>
37-
<run_depend>visualization_msgs</run_depend>
38-
<run_depend>sensor_msgs</run_depend>
39-
<run_depend>pcl_ros</run_depend>
40-
<run_depend>pcl_conversions</run_depend>
41-
<run_depend>nav_msgs</run_depend>
42-
<run_depend>std_msgs</run_depend>
43-
<run_depend>std_srvs</run_depend>
44-
<run_depend>octomap</run_depend>
45-
<run_depend>octomap_msgs</run_depend>
46-
<run_depend>octomap_ros</run_depend>
47-
<run_depend>dynamic_reconfigure</run_depend>
48-
<run_depend>nodelet</run_depend>
49-
<run_depend>libpcl-all</run_depend>
50-
35+
<exec_depend>roscpp</exec_depend>
36+
<exec_depend>visualization_msgs</exec_depend>
37+
<exec_depend>sensor_msgs</exec_depend>
38+
<exec_depend>pcl_ros</exec_depend>
39+
<exec_depend>pcl_conversions</exec_depend>
40+
<exec_depend>nav_msgs</exec_depend>
41+
<exec_depend>std_msgs</exec_depend>
42+
<exec_depend>std_srvs</exec_depend>
43+
<exec_depend>octomap</exec_depend>
44+
<exec_depend>octomap_msgs</exec_depend>
45+
<exec_depend>octomap_ros</exec_depend>
46+
<exec_depend>dynamic_reconfigure</exec_depend>
47+
<exec_depend>nodelet</exec_depend>
5148
</package>
52-
53-

0 commit comments

Comments
 (0)