From 19150c75e4f697ebe197cd223a0f6c57b61a2e65 Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Thu, 14 Nov 2024 19:24:18 +0100 Subject: [PATCH] added newer ROS2 versions --- .../{ros-melodic.yml => ros-iron.yml} | 18 +++++------ .github/workflows/ros-jazzy.yml | 31 +++++++++++++++++++ README.md | 8 ++--- 3 files changed, 43 insertions(+), 14 deletions(-) rename .github/workflows/{ros-melodic.yml => ros-iron.yml} (71%) create mode 100644 .github/workflows/ros-jazzy.yml diff --git a/.github/workflows/ros-melodic.yml b/.github/workflows/ros-iron.yml similarity index 71% rename from .github/workflows/ros-melodic.yml rename to .github/workflows/ros-iron.yml index 6207eaa8f..c5df78b95 100644 --- a/.github/workflows/ros-melodic.yml +++ b/.github/workflows/ros-iron.yml @@ -1,20 +1,20 @@ -name: melodic +name: iron on: push: branches: - 'develop' - - 'melodic' + - 'iron' pull_request: branches: - 'develop' - - 'melodic' + - 'iron' workflow_dispatch: branches: - '*' jobs: - ros_noetic: - name: melodic - runs-on: ubuntu-18.04 + ros_iron: + name: iron + runs-on: ubuntu-22.04 strategy: fail-fast: false steps: @@ -22,10 +22,10 @@ jobs: uses: actions/checkout@v4 with: submodules: recursive - - - name: Compile LVR2 in ROS2 1 melodic WS + + - name: Compile LVR2 in ROS 2 iron WS uses: 'ros-industrial/industrial_ci@master' env: - ROS_DISTRO: melodic + ROS_DISTRO: iron ROS_REPO: main AFTER_SCRIPT: cd ~/target_ws && ./build/lvr2/bin/lvr2_reconstruct src/lvr2/dat/scan.pts \ No newline at end of file diff --git a/.github/workflows/ros-jazzy.yml b/.github/workflows/ros-jazzy.yml new file mode 100644 index 000000000..c4ecb28f2 --- /dev/null +++ b/.github/workflows/ros-jazzy.yml @@ -0,0 +1,31 @@ +name: jazzy +on: + push: + branches: + - 'develop' + - 'jazzy' + pull_request: + branches: + - 'develop' + - 'jazzy' + workflow_dispatch: + branches: + - '*' +jobs: + ros_jazzy: + name: jazzy + runs-on: ubuntu-24.04 + strategy: + fail-fast: false + steps: + - name: Checkout LVR2 + uses: actions/checkout@v4 + with: + submodules: recursive + + - name: Compile LVR2 in ROS 2 jazzy WS + uses: 'ros-industrial/industrial_ci@master' + env: + ROS_DISTRO: jazzy + ROS_REPO: main + AFTER_SCRIPT: cd ~/target_ws && ./build/lvr2/bin/lvr2_reconstruct src/lvr2/dat/scan.pts \ No newline at end of file diff --git a/README.md b/README.md index 7140b1665..2fb7d931b 100644 --- a/README.md +++ b/README.md @@ -133,8 +133,6 @@ Please reference the following papers when using the lvr2 library in your scient You can simply download this library and compile it inside your ROS workspace. The following ROS distributions are supported: | Version | Supported Distributions | -|:------|:-----| -| ROS 1 | [![CI](https://github.com/uos/lvr2/workflows/noetic/badge.svg)](https://github.com/uos/lvr2/actions/workflows/ros-noetic.yml) | -| ROS 2 | [![CI](https://github.com/uos/lvr2/workflows/humble/badge.svg)](https://github.com/uos/lvr2/actions/workflows/ros-humble.yml) | - - +|:-----------|:----------------------------| +| ROS 1 | [![noetic](https://github.com/uos/lvr2/actions/workflows/ros-noetic.yml/badge.svg)](https://github.com/uos/lvr2/actions/workflows/ros-noetic.yml) | +| ROS 2 | [![humble](https://github.com/uos/lvr2/actions/workflows/ros-humble.yml/badge.svg)](https://github.com/uos/lvr2/actions/workflows/ros-humble.yml) [![iron](https://github.com/uos/lvr2/actions/workflows/ros-iron.yml/badge.svg)](https://github.com/uos/lvr2/actions/workflows/ros-iron.yml) [![jazzy](https://github.com/uos/lvr2/actions/workflows/ros-jazzy.yml/badge.svg)](https://github.com/uos/lvr2/actions/workflows/ros-jazzy.yml) | \ No newline at end of file