merged main -> humble-devel

.github/workflows/docker-ros2.yml

@@ -2,8 +2,13 @@ name: docker
 
 on:
   push:
-    branches:
-      - 'ros2'
+    branches: [ ros2 ]
+  pull_request:
+    branches: [ ros2 ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
   docker:
@@ -12,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        docker_tag: [humble, humble-latest, jazzy, jazzy-latest, kilted-latest]
+        docker_tag: [humble, humble-latest, jazzy, jazzy-latest, kilted, kilted-latest, lyrical-latest]
         include:
         - docker_tag: humble
           docker_path: 'humble'
@@ -33,8 +38,23 @@ jobs:
           docker_platforms: |
             linux/amd64
             linux/arm64
+        - docker_tag: kilted
+          docker_path: 'kilted'
+          docker_platforms: |
+            linux/amd64
+            linux/arm64
         - docker_tag: kilted-latest
           docker_path: 'kilted/latest'
+          docker_platforms: |
+            linux/amd64
+        #Disabled till rtabmap_ros is released on lyrical
+        #- docker_tag: lyrical
+        #  docker_path: 'lyrical'
+        #  docker_platforms: |
+        #    linux/amd64
+        #    linux/arm64
+        - docker_tag: lyrical-latest
+          docker_path: 'lyrical/latest'
           docker_platforms: |
             linux/amd64
             linux/arm64
@@ -53,6 +73,9 @@ jobs:
         uses: docker/setup-buildx-action@v3
       -
         name: Login to DockerHub
+        # Only needed when pushing; skipped on pull requests (secrets are
+        # unavailable for fork PRs and we don't push there anyway).
+        if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -62,8 +85,8 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          push: true
-          platforms: ${{ matrix.docker_platforms }}
+          push: ${{ github.event_name != 'pull_request' }}
+          platforms: ${{ github.event_name == 'pull_request' && 'linux/amd64' || matrix.docker_platforms }}
           file: ./docker/${{ matrix.docker_path }}/Dockerfile
           tags: introlab3it/rtabmap_ros:${{ matrix.docker_tag }}
           no-cache: true

.github/workflows/ros2.yml

@@ -10,6 +10,10 @@ on:
 env:
   BUILD_TYPE: Release
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
   build:
     name: Build ros2 ${{ matrix.ros_distro }}
@@ -20,6 +24,7 @@ jobs:
         include:
         - ros_distro: humble
           skip_keys: ''
+          packages: 'rtabmap_ros'
       fail-fast: false
     container:
       image: osrf/ros:${{ matrix.ros_distro }}-desktop-full
@@ -28,12 +33,16 @@ jobs:
     - uses: ros-tooling/[email protected]
       with:
         required-ros-distributions: ${{ matrix.ros_distro }}
+    - run: |
+        DEBIAN_FRONTEND=noninteractive
+        sudo apt update
+        sudo apt upgrade -y
     - run: |
         echo "repositories:\n  introlab/rtabmap:\n    type: git\n    url: https://github.com/introlab/rtabmap.git\n    version: humble-devel\n" > /tmp/deps.repos &&\
         cat /tmp/deps.repos
     - uses: ros-tooling/[email protected]
       with:
-        package-name: rtabmap_ros
+        package-name: ${{ matrix.packages }}
         target-ros2-distro: ${{ matrix.ros_distro }}
         vcs-repo-file-url: /tmp/deps.repos
         rosdep-check: true