From d0a651d7cce2b7142cfe649061e42061575fb897 Mon Sep 17 00:00:00 2001 From: artivis Date: Sun, 23 May 2021 12:56:34 -0400 Subject: [PATCH 1/3] add downstream ci --- .downstream_ci.rosinstall | 8 ++++++++ .github/workflows/ci.yml | 24 +++++++++++++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 .downstream_ci.rosinstall diff --git a/.downstream_ci.rosinstall b/.downstream_ci.rosinstall new file mode 100644 index 0000000..f5693fe --- /dev/null +++ b/.downstream_ci.rosinstall @@ -0,0 +1,8 @@ +- git: {local-name: rosparam_handler, uri: 'https://github.com/cbandera/rosparam_handler.git', version: master} +- git: {local-name: laser_odometry_csm, uri: 'https://github.com/artivis/laser_odometry_csm', version: master} +- git: {local-name: laser_odometry_libpointmacther, uri: 'https://github.com/artivis/laser_odometry_libpointmacther', version: master} +- git: {local-name: laser_odometry_polar, uri: 'https://github.com/artivis/laser_odometry_polar', version: master} +- git: {local-name: rf2o_laser_odometry, uri: 'https://github.com/artivis/rf2o_laser_odometry.git', version: devel} +- git: {local-name: laser_odometry_rf2o, uri: 'https://github.com/artivis/laser_odometry_rf2o', version: master} +- git: {local-name: srf_laser_odometry, uri: 'https://github.com/artivis/srf_laser_odometry.git', version: devel} +- git: {local-name: laser_odometry_srf, uri: 'https://github.com/artivis/laser_odometry_srf', version: master} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4beaedf..c6ee31b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,13 +15,27 @@ jobs: industrial_ci: strategy: matrix: + ros_distro: [ melodic, noetic ] + ros_repo: [ main, testing ] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - uses: 'ros-industrial/industrial_ci@master' env: - - {ROS_DISTRO: melodic, ROS_REPO: testing} - - {ROS_DISTRO: melodic, ROS_REPO: main} - - {ROS_DISTRO: noetic, ROS_REPO: testing} - - {ROS_DISTRO: noetic, ROS_REPO: main} + ROS_DISTRO: ${{ matrix.ros_distro }} + ROS_REPO: ${{ matrix.ros_repo }} + + downstream_ci: + needs: [industrial_ci] + strategy: + matrix: + ros_distro: [ melodic, noetic ] + ros_repo: [ main, testing ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - uses: 'ros-industrial/industrial_ci@master' - env: ${{matrix.env}} + env: + ROS_DISTRO: ${{ matrix.ros_distro }} + ROS_REPO: ${{ matrix.ros_repo }} + DOWNSTREAM_WORKSPACE: .downstream_ci.rosinstall From a3ea89d8e02099c443bf58a6d7587c8210cc9f04 Mon Sep 17 00:00:00 2001 From: Jeremie Deray Date: Sat, 17 Jul 2021 08:47:31 -0400 Subject: [PATCH 2/3] fix typo --- .downstream_ci.rosinstall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.downstream_ci.rosinstall b/.downstream_ci.rosinstall index f5693fe..fad40bf 100644 --- a/.downstream_ci.rosinstall +++ b/.downstream_ci.rosinstall @@ -1,6 +1,6 @@ - git: {local-name: rosparam_handler, uri: 'https://github.com/cbandera/rosparam_handler.git', version: master} - git: {local-name: laser_odometry_csm, uri: 'https://github.com/artivis/laser_odometry_csm', version: master} -- git: {local-name: laser_odometry_libpointmacther, uri: 'https://github.com/artivis/laser_odometry_libpointmacther', version: master} +- git: {local-name: laser_odometry_libpointmatcher, uri: 'https://github.com/artivis/laser_odometry_libpointmatcher', version: master} - git: {local-name: laser_odometry_polar, uri: 'https://github.com/artivis/laser_odometry_polar', version: master} - git: {local-name: rf2o_laser_odometry, uri: 'https://github.com/artivis/rf2o_laser_odometry.git', version: devel} - git: {local-name: laser_odometry_rf2o, uri: 'https://github.com/artivis/laser_odometry_rf2o', version: master} From ce1fcbed8cbca4d4690298052ebfb6fd14020f96 Mon Sep 17 00:00:00 2001 From: Jeremie Deray Date: Sat, 17 Jul 2021 09:49:07 -0400 Subject: [PATCH 3/3] rosinstall libpointmatcher --- .downstream_ci.rosinstall | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.downstream_ci.rosinstall b/.downstream_ci.rosinstall index fad40bf..a612a65 100644 --- a/.downstream_ci.rosinstall +++ b/.downstream_ci.rosinstall @@ -1,5 +1,7 @@ - git: {local-name: rosparam_handler, uri: 'https://github.com/cbandera/rosparam_handler.git', version: master} - git: {local-name: laser_odometry_csm, uri: 'https://github.com/artivis/laser_odometry_csm', version: master} +- git: {local-name: libnabo, uri: 'https://github.com/ethz-asl/libnabo', version: master} +- git: {local-name: libpointmatcher, uri: 'https://github.com/ethz-asl/libpointmatcher', version: master} - git: {local-name: laser_odometry_libpointmatcher, uri: 'https://github.com/artivis/laser_odometry_libpointmatcher', version: master} - git: {local-name: laser_odometry_polar, uri: 'https://github.com/artivis/laser_odometry_polar', version: master} - git: {local-name: rf2o_laser_odometry, uri: 'https://github.com/artivis/rf2o_laser_odometry.git', version: devel}