From d286d2f5d927401cce2cc4efac0edcdba7ce9c3c Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Thu, 14 Nov 2024 15:09:37 +0100 Subject: [PATCH 01/16] added new humble ci --- .github/workflows/humble-ros.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/humble-ros.yml b/.github/workflows/humble-ros.yml index a3e78f979..f06fb77f0 100644 --- a/.github/workflows/humble-ros.yml +++ b/.github/workflows/humble-ros.yml @@ -2,24 +2,26 @@ name: CI-humble on: push: branches: + - 'develop' - 'humble' pull_request: branches: + - 'develop' - 'humble' workflow_dispatch: branches: - '*' jobs: industrial_ci: - strategy: - matrix: - env: - - {ROS_DISTRO: humble, ROS_REPO: testing} - - {ROS_DISTRO: humble, ROS_REPO: main} + name: ROS 2 humble runs-on: ubuntu-22.04 + strategy: + fail-fast: false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: recursive - uses: 'ros-industrial/industrial_ci@master' - env: ${{matrix.env}} + env: + ROS_DISTRO: humble + ROS_REPO: main From 03df624e84daa3a9f134d254ecf56b4a528018a4 Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Thu, 14 Nov 2024 15:25:06 +0100 Subject: [PATCH 02/16] new humble workflow --- .github/workflows/humble-ros.yml | 27 ------------- .github/workflows/master-ros.yml | 27 ------------- .github/workflows/melodic-ros.yml | 25 ------------ .github/workflows/ros-humble.yml | 38 +++++++++++++++++++ .../{noetic-ros.yml => ros-noetic.yml} | 0 5 files changed, 38 insertions(+), 79 deletions(-) delete mode 100644 .github/workflows/humble-ros.yml delete mode 100644 .github/workflows/master-ros.yml delete mode 100644 .github/workflows/melodic-ros.yml create mode 100644 .github/workflows/ros-humble.yml rename .github/workflows/{noetic-ros.yml => ros-noetic.yml} (100%) diff --git a/.github/workflows/humble-ros.yml b/.github/workflows/humble-ros.yml deleted file mode 100644 index f06fb77f0..000000000 --- a/.github/workflows/humble-ros.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: CI-humble -on: - push: - branches: - - 'develop' - - 'humble' - pull_request: - branches: - - 'develop' - - 'humble' - workflow_dispatch: - branches: - - '*' -jobs: - industrial_ci: - name: ROS 2 humble - runs-on: ubuntu-22.04 - strategy: - fail-fast: false - steps: - - uses: actions/checkout@v4 - with: - submodules: recursive - - uses: 'ros-industrial/industrial_ci@master' - env: - ROS_DISTRO: humble - ROS_REPO: main diff --git a/.github/workflows/master-ros.yml b/.github/workflows/master-ros.yml deleted file mode 100644 index 87dd5dc38..000000000 --- a/.github/workflows/master-ros.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: CI-master -on: - push: - branches: - - 'master' - pull_request: - branches: - - 'master' - workflow_dispatch: - branches: - - '*' -jobs: - industrial_ci: - strategy: - matrix: - 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} - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - uses: 'ros-industrial/industrial_ci@master' - env: ${{matrix.env}} diff --git a/.github/workflows/melodic-ros.yml b/.github/workflows/melodic-ros.yml deleted file mode 100644 index 4eae42bb0..000000000 --- a/.github/workflows/melodic-ros.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: CI-melodic -on: - push: - branches: - - 'melodic' - pull_request: - branches: - - 'melodic' - workflow_dispatch: - branches: - - '*' -jobs: - industrial_ci: - strategy: - matrix: - env: - - {ROS_DISTRO: melodic, ROS_REPO: testing} - - {ROS_DISTRO: melodic, ROS_REPO: main} - runs-on: ubuntu-18.04 - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - uses: 'ros-industrial/industrial_ci@master' - env: ${{matrix.env}} diff --git a/.github/workflows/ros-humble.yml b/.github/workflows/ros-humble.yml new file mode 100644 index 000000000..064ee6ccb --- /dev/null +++ b/.github/workflows/ros-humble.yml @@ -0,0 +1,38 @@ +name: CI-humble +on: + push: + branches: + - 'develop' + - 'humble' + pull_request: + branches: + - 'develop' + - 'humble' + workflow_dispatch: + branches: + - '*' +jobs: + ros_humble: + name: ROS 2 humble + runs-on: ubuntu-22.04 + strategy: + fail-fast: false + env: + CCACHE_DIR: "${{ github.workspace }}/.ccache" + steps: + - name: Checkout LVR2 + uses: actions/checkout@v4 + with: + submodules: recursive + + - name: Compile for ROS2 humble + uses: 'ros-industrial/industrial_ci@master' + env: + ROS_DISTRO: humble + ROS_REPO: main + - uses: actions/cache@v2 + with: + path: ${{ env.CCACHE_DIR }} + key: ccache-humble-${{github.run_id}} + restore-keys: | + ccache-humble- diff --git a/.github/workflows/noetic-ros.yml b/.github/workflows/ros-noetic.yml similarity index 100% rename from .github/workflows/noetic-ros.yml rename to .github/workflows/ros-noetic.yml From db1edfc21c5f818872a92f533c742bb87954b087 Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Thu, 14 Nov 2024 15:39:18 +0100 Subject: [PATCH 03/16] added execution to ci --- .github/workflows/ros-humble.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ros-humble.yml b/.github/workflows/ros-humble.yml index 064ee6ccb..5643ebf15 100644 --- a/.github/workflows/ros-humble.yml +++ b/.github/workflows/ros-humble.yml @@ -17,22 +17,15 @@ jobs: runs-on: ubuntu-22.04 strategy: fail-fast: false - env: - CCACHE_DIR: "${{ github.workspace }}/.ccache" steps: - name: Checkout LVR2 uses: actions/checkout@v4 with: submodules: recursive - - name: Compile for ROS2 humble uses: 'ros-industrial/industrial_ci@master' env: ROS_DISTRO: humble ROS_REPO: main - - uses: actions/cache@v2 - with: - path: ${{ env.CCACHE_DIR }} - key: ccache-humble-${{github.run_id}} - restore-keys: | - ccache-humble- + - name: Execute lvr2_reconstruct + run: ./devel/bin/lvr2_reconstruct src/lvr2/dat/scan.pts \ No newline at end of file From 58f8f95159de2fd595d6988eb2adba792d391ba8 Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Thu, 14 Nov 2024 15:40:52 +0100 Subject: [PATCH 04/16] fixed bug --- .github/workflows/ros-humble.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ros-humble.yml b/.github/workflows/ros-humble.yml index 5643ebf15..ca5d4c9ba 100644 --- a/.github/workflows/ros-humble.yml +++ b/.github/workflows/ros-humble.yml @@ -22,10 +22,12 @@ jobs: uses: actions/checkout@v4 with: submodules: recursive + - name: Compile for ROS2 humble uses: 'ros-industrial/industrial_ci@master' env: ROS_DISTRO: humble ROS_REPO: main - - name: Execute lvr2_reconstruct - run: ./devel/bin/lvr2_reconstruct src/lvr2/dat/scan.pts \ No newline at end of file + + - name: Execute LVR2 Reconstruct + run: ./devel/bin/lvr2_reconstruct src/lvr2/dat/scan.pts \ No newline at end of file From 19645978713bbee18a80501969390e1cffcfd30f Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Thu, 14 Nov 2024 15:55:14 +0100 Subject: [PATCH 05/16] added path to target ws --- .github/workflows/ros-humble.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ros-humble.yml b/.github/workflows/ros-humble.yml index ca5d4c9ba..49de0784f 100644 --- a/.github/workflows/ros-humble.yml +++ b/.github/workflows/ros-humble.yml @@ -28,6 +28,6 @@ jobs: env: ROS_DISTRO: humble ROS_REPO: main - + - name: Execute LVR2 Reconstruct - run: ./devel/bin/lvr2_reconstruct src/lvr2/dat/scan.pts \ No newline at end of file + run: cd $BASEDIR/${PREFIX}target_ws && ./devel/bin/lvr2_reconstruct src/lvr2/dat/scan.pts \ No newline at end of file From 8b7d61eb1bb58b60cb7a78eddfc1cfa0034e6ba1 Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Thu, 14 Nov 2024 16:06:13 +0100 Subject: [PATCH 06/16] added hardcoded path to root workspace --- .github/workflows/ros-humble.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ros-humble.yml b/.github/workflows/ros-humble.yml index 49de0784f..efe4649a8 100644 --- a/.github/workflows/ros-humble.yml +++ b/.github/workflows/ros-humble.yml @@ -23,11 +23,11 @@ jobs: with: submodules: recursive - - name: Compile for ROS2 humble + - name: Compile LVR2 in ROS2 humble WS uses: 'ros-industrial/industrial_ci@master' env: ROS_DISTRO: humble ROS_REPO: main - name: Execute LVR2 Reconstruct - run: cd $BASEDIR/${PREFIX}target_ws && ./devel/bin/lvr2_reconstruct src/lvr2/dat/scan.pts \ No newline at end of file + run: cd /root/target_ws && ./devel/bin/lvr2_reconstruct src/lvr2/dat/scan.pts \ No newline at end of file From a81745e2ffdbc10610d9bcca98c0401b082f1f17 Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Thu, 14 Nov 2024 18:12:07 +0100 Subject: [PATCH 07/16] added ls since I have to figure out the home path --- .github/workflows/ros-humble.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ros-humble.yml b/.github/workflows/ros-humble.yml index efe4649a8..dbfb45836 100644 --- a/.github/workflows/ros-humble.yml +++ b/.github/workflows/ros-humble.yml @@ -18,6 +18,9 @@ jobs: strategy: fail-fast: false steps: + - name: Home Dir + run: cd ~ && pwd + - name: Checkout LVR2 uses: actions/checkout@v4 with: @@ -29,5 +32,5 @@ jobs: ROS_DISTRO: humble ROS_REPO: main - - name: Execute LVR2 Reconstruct - run: cd /root/target_ws && ./devel/bin/lvr2_reconstruct src/lvr2/dat/scan.pts \ No newline at end of file + # - name: Execute LVR2 Reconstruct + # run: cd /root/target_ws && ./devel/bin/lvr2_reconstruct src/lvr2/dat/scan.pts \ No newline at end of file From 12858d807db9bcdca82a94d0119a74a323d91d85 Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Thu, 14 Nov 2024 18:22:56 +0100 Subject: [PATCH 08/16] next try --- .github/workflows/ros-humble.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ros-humble.yml b/.github/workflows/ros-humble.yml index dbfb45836..f6a24c5f6 100644 --- a/.github/workflows/ros-humble.yml +++ b/.github/workflows/ros-humble.yml @@ -31,6 +31,9 @@ jobs: env: ROS_DISTRO: humble ROS_REPO: main + with: + AFTER_SCRIPT: | + cd ~/target_ws && ./devel/bin/lvr2_reconstruct src/lvr2/dat/scan.pts # - name: Execute LVR2 Reconstruct # run: cd /root/target_ws && ./devel/bin/lvr2_reconstruct src/lvr2/dat/scan.pts \ No newline at end of file From 2ac79aaf7675c7050783c149726edfdb9637c41d Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Thu, 14 Nov 2024 18:24:26 +0100 Subject: [PATCH 09/16] added after scripts as env var --- .github/workflows/ros-humble.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ros-humble.yml b/.github/workflows/ros-humble.yml index f6a24c5f6..5b8a1b497 100644 --- a/.github/workflows/ros-humble.yml +++ b/.github/workflows/ros-humble.yml @@ -31,9 +31,7 @@ jobs: env: ROS_DISTRO: humble ROS_REPO: main - with: - AFTER_SCRIPT: | - cd ~/target_ws && ./devel/bin/lvr2_reconstruct src/lvr2/dat/scan.pts + AFTER_SCRIPT: cd ~/target_ws && ./devel/bin/lvr2_reconstruct src/lvr2/dat/scan.pts # - name: Execute LVR2 Reconstruct # run: cd /root/target_ws && ./devel/bin/lvr2_reconstruct src/lvr2/dat/scan.pts \ No newline at end of file From a94af4398b9b6db5124aba024fa831ff76e89670 Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Thu, 14 Nov 2024 18:34:18 +0100 Subject: [PATCH 10/16] next try --- .github/workflows/ros-humble.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ros-humble.yml b/.github/workflows/ros-humble.yml index 5b8a1b497..f3cfebada 100644 --- a/.github/workflows/ros-humble.yml +++ b/.github/workflows/ros-humble.yml @@ -31,7 +31,7 @@ jobs: env: ROS_DISTRO: humble ROS_REPO: main - AFTER_SCRIPT: cd ~/target_ws && ./devel/bin/lvr2_reconstruct src/lvr2/dat/scan.pts + AFTER_SCRIPT: cd ~/target_ws && ./build/lvr2/bin/lvr2_reconstruct src/lvr2/dat/scan.pts # - name: Execute LVR2 Reconstruct # run: cd /root/target_ws && ./devel/bin/lvr2_reconstruct src/lvr2/dat/scan.pts \ No newline at end of file From ce3d9340f6999c35e2f9283eb763baf732f84527 Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Thu, 14 Nov 2024 18:51:27 +0100 Subject: [PATCH 11/16] added new workflow for noetic --- .github/workflows/ros-humble.yml | 12 +++--------- .github/workflows/ros-noetic.yml | 24 +++++++++++++++--------- README.md | 27 ++++++++++++++++++++++++--- 3 files changed, 42 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ros-humble.yml b/.github/workflows/ros-humble.yml index f3cfebada..18278ada9 100644 --- a/.github/workflows/ros-humble.yml +++ b/.github/workflows/ros-humble.yml @@ -18,20 +18,14 @@ jobs: strategy: fail-fast: false steps: - - name: Home Dir - run: cd ~ && pwd - - name: Checkout LVR2 uses: actions/checkout@v4 with: submodules: recursive - - - name: Compile LVR2 in ROS2 humble WS + + - name: Compile LVR2 in ROS 2 humble WS uses: 'ros-industrial/industrial_ci@master' env: ROS_DISTRO: humble ROS_REPO: main - AFTER_SCRIPT: cd ~/target_ws && ./build/lvr2/bin/lvr2_reconstruct src/lvr2/dat/scan.pts - - # - name: Execute LVR2 Reconstruct - # run: cd /root/target_ws && ./devel/bin/lvr2_reconstruct src/lvr2/dat/scan.pts \ No newline at end of file + 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-noetic.yml b/.github/workflows/ros-noetic.yml index 0326f6073..a2dc71282 100644 --- a/.github/workflows/ros-noetic.yml +++ b/.github/workflows/ros-noetic.yml @@ -2,24 +2,30 @@ name: CI-noetic on: push: branches: + - 'develop' - 'noetic' pull_request: branches: + - 'develop' - 'noetic' workflow_dispatch: branches: - '*' jobs: - industrial_ci: - strategy: - matrix: - env: - - {ROS_DISTRO: noetic, ROS_REPO: testing} - - {ROS_DISTRO: noetic, ROS_REPO: main} + ros_noetic: + name: ROS 1 noetic runs-on: ubuntu-20.04 + strategy: + fail-fast: false steps: - - uses: actions/checkout@v2 + - name: Checkout LVR2 + uses: actions/checkout@v4 with: submodules: recursive - - uses: 'ros-industrial/industrial_ci@master' - env: ${{matrix.env}} + + - name: Compile LVR2 in ROS2 1 noetic WS + uses: 'ros-industrial/industrial_ci@master' + env: + ROS_DISTRO: noetic + 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 7157ff2d2..7855b0b13 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,23 @@ +```console + /\ + / \ ## ## ## ####### ###### + / \ ## ## ## ## ## ## ## + / \ ## ## ## ## ## ## + /________\ ## ## ## ## ## ## + /\ /\ ## ## ## ####### ## + / \ / \ ## ## ## ## ## ## + / \ / \ ## #### ## ## ## + / \ / \ ########## ## ## ## ########## +/________\/________\ +``` + # About This library delivers tools to build surface reconstructions from point cloud data and a simple viewer to display the results. Additionally, the found surfaces will be classified into predefined categories. The main aim of this project is to deliver fast and accurate algorithms for surface reconstruction with a strong focus on -robotic applications such as tele operation in unknown environments and +robotic applications such as teleoperation in unknown environments and localization. # Download and Compilation from Source @@ -13,7 +26,7 @@ localization. https://github.com/uos/lvr2 - develop -## Linux (Ubuntu 18.04, 20.04, 22.04) +## Linux (Ubuntu 18.04, 20.04, 22.04, 24.04) ### Step 1: Install all required package dependencies: @@ -112,4 +125,12 @@ Please reference the following papers when using the lvr2 library in your scient year={2018}, pages={278-281}, doi={10.1109/IRC.2018.00059}} -``` \ No newline at end of file +``` + + +## ROS build + +You can simply download this library and compile it inside your ROS workspace. The following ROS distributions are supported: + +TODO badges + From 38e3ffb75e4f4c4302beebb604bbeb91baa0ebca Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Thu, 14 Nov 2024 19:00:10 +0100 Subject: [PATCH 12/16] changed names of workflow --- .github/workflows/ros-humble.yml | 2 +- .github/workflows/ros-noetic.yml | 2 +- README.md | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ros-humble.yml b/.github/workflows/ros-humble.yml index 18278ada9..791ebb03e 100644 --- a/.github/workflows/ros-humble.yml +++ b/.github/workflows/ros-humble.yml @@ -1,4 +1,4 @@ -name: CI-humble +name: humble on: push: branches: diff --git a/.github/workflows/ros-noetic.yml b/.github/workflows/ros-noetic.yml index a2dc71282..313eb5a86 100644 --- a/.github/workflows/ros-noetic.yml +++ b/.github/workflows/ros-noetic.yml @@ -1,4 +1,4 @@ -name: CI-noetic +name: noetic on: push: branches: diff --git a/README.md b/README.md index 7855b0b13..398474738 100644 --- a/README.md +++ b/README.md @@ -132,5 +132,9 @@ 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: -TODO badges +| | | +|:------|:-----| +| 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) | + From 51d0b9a4cb616eed049c21920e8a24ac8978af0b Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Thu, 14 Nov 2024 19:09:18 +0100 Subject: [PATCH 13/16] renamed again because of the badges --- .github/workflows/ros-humble.yml | 2 +- .github/workflows/ros-noetic.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ros-humble.yml b/.github/workflows/ros-humble.yml index 791ebb03e..2f974e4fb 100644 --- a/.github/workflows/ros-humble.yml +++ b/.github/workflows/ros-humble.yml @@ -13,7 +13,7 @@ on: - '*' jobs: ros_humble: - name: ROS 2 humble + name: humble runs-on: ubuntu-22.04 strategy: fail-fast: false diff --git a/.github/workflows/ros-noetic.yml b/.github/workflows/ros-noetic.yml index 313eb5a86..6b8dca717 100644 --- a/.github/workflows/ros-noetic.yml +++ b/.github/workflows/ros-noetic.yml @@ -13,7 +13,7 @@ on: - '*' jobs: ros_noetic: - name: ROS 1 noetic + name: noetic runs-on: ubuntu-20.04 strategy: fail-fast: false From 76a4bd410e180d000c9cd74d618e8ff96eb77870 Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Thu, 14 Nov 2024 19:10:12 +0100 Subject: [PATCH 14/16] readme rewrite --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 398474738..7140b1665 100644 --- a/README.md +++ b/README.md @@ -132,7 +132,7 @@ 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) | From 483f615cc1bd0bea24822fb9c7077e7281e04fbd Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Thu, 14 Nov 2024 19:12:36 +0100 Subject: [PATCH 15/16] added melodic workflow as test --- .github/workflows/ros-melodic.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/ros-melodic.yml diff --git a/.github/workflows/ros-melodic.yml b/.github/workflows/ros-melodic.yml new file mode 100644 index 000000000..6207eaa8f --- /dev/null +++ b/.github/workflows/ros-melodic.yml @@ -0,0 +1,31 @@ +name: melodic +on: + push: + branches: + - 'develop' + - 'melodic' + pull_request: + branches: + - 'develop' + - 'melodic' + workflow_dispatch: + branches: + - '*' +jobs: + ros_noetic: + name: melodic + runs-on: ubuntu-18.04 + strategy: + fail-fast: false + steps: + - name: Checkout LVR2 + uses: actions/checkout@v4 + with: + submodules: recursive + + - name: Compile LVR2 in ROS2 1 melodic WS + uses: 'ros-industrial/industrial_ci@master' + env: + ROS_DISTRO: melodic + ROS_REPO: main + AFTER_SCRIPT: cd ~/target_ws && ./build/lvr2/bin/lvr2_reconstruct src/lvr2/dat/scan.pts \ No newline at end of file From 19150c75e4f697ebe197cd223a0f6c57b61a2e65 Mon Sep 17 00:00:00 2001 From: Alexander Mock Date: Thu, 14 Nov 2024 19:24:18 +0100 Subject: [PATCH 16/16] 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