Merge branch 'master' of github.com:introlab/rtabmap into lyrical-devel

.github/workflows/cmake-ros.yml

@@ -4,12 +4,19 @@ on:
   push:
     branches: 
       - lyrical-devel
+    paths-ignore: &platform_only
+      - '.github/workflows/android.yml'
+      - '.github/workflows/ios.yml'
+      - 'app/android/**'
+      - 'app/ios/**'
+      - 'docker/noble/android/**'
   pull_request:
-    branches: 
+    branches:
       - '**'
+    paths-ignore: *platform_only
+  workflow_dispatch:
 
 env:
-  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
 
 concurrency:
@@ -18,29 +25,77 @@ concurrency:
 
 jobs:
   build:
-    # The CMake configure and build commands are platform agnostic and should work equally
-    # well on Windows or Mac.  You can convert this to a matrix build if you need
-    # cross-platform coverage.
-    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    name: ${{ matrix.ros_distribution }}
+    name: ${{ matrix.ros_distribution }}${{ matrix.use_ros2_testing && '-testing' || '' }}
     runs-on: ubuntu-latest
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.ros_distribution }}-${{ matrix.use_ros2_testing }}
+      cancel-in-progress: true
     strategy:
       fail-fast: false
       matrix:
         ros_distribution: [ lyrical ]
+        # Build against both main (what users install) and ros2-testing (closest to
+        # what the buildfarm builds bloom releases against).
+        use_ros2_testing: [ false, true ]
         include:
         - ros_distribution: 'lyrical'
-          skip_keys: "" # When releasing to ROS2, the skip_keys shoudl be empty, patch these deps in package.xml instead.
+          skip_keys: "" # When releasing to ROS2, the skip_keys should be empty, patch these deps in package.xml instead.
     container:
       image: osrf/ros:${{ matrix.ros_distribution }}-desktop-full
-    steps:   
+    steps:
     - uses: actions/checkout@v4
+
+    - name: Restore test data
+      id: cache-testdata
+      uses: actions/cache@v4
+      with:
+        path: data/tests/*.db
+        key: testdata-${{ hashFiles('data/tests/manifest.txt') }}
+
+    - name: Fetch test data
+      if: steps.cache-testdata.outputs.cache-hit != 'true'
+      shell: bash
+      run: |
+        # The ROS images are slim; fetch_test_data.sh needs curl, and 7-Zip for
+        # the assets that come as an archive. The package holding it is
+        # p7zip-full up to Ubuntu 24.04 and 7zip on the newer ones.
+        command -v curl >/dev/null || (apt-get update && apt-get install -y --no-install-recommends curl)
+        command -v 7z >/dev/null || command -v 7zz >/dev/null || (apt-get update && \
+          (apt-get install -y --no-install-recommends p7zip-full || \
+           apt-get install -y --no-install-recommends 7zip))
+        bash scripts/fetch_test_data.sh
+
+    # `${{ github.workspace }}` is expanded by the runner on the *host*
+    # (/home/runner/work/...), but this job runs in a container where the runner
+    # bind-mounts that directory somewhere else (/__w/...). Baking the host path
+    # into RTABMAP_TEST_DATA_ROOT points every data-driven test at a directory
+    # that does not exist in the container: the integration tests silently skip
+    # and the ones that imread() committed fixtures abort outright.
+    #
+    # Resolve the path inside the container instead. A `run` step's cwd is the
+    # checkout root -- the same assumption the relative `scripts/...` and
+    # `data/tests/*.db` paths in the steps above already rely on -- so derive it
+    # from $PWD rather than trusting a path computed outside the container. The
+    # existence checks then turn that into a verified precondition: a wrong
+    # mount point or a failed fetch fails here, with the path printed, instead
+    # of degrading into skipped tests.
+    - name: Resolve test data root in the container
+      id: testdata
+      shell: bash
+      run: |
+        root="$PWD/data"
+        test -f "$root/samples/17.jpg" || { echo "::error::test data root $root is missing committed fixtures"; exit 1; }
+        ls "$root"/tests/*.db >/dev/null || { echo "::error::no test databases in $root/tests"; exit 1; }
+        echo "root=$root" >> "$GITHUB_OUTPUT"
+
     - uses: ros-tooling/[email protected]
       with:
         required-ros-distributions: ${{ matrix.ros_distribution }}
+        use-ros2-testing: ${{ matrix.use_ros2_testing }}
     - uses: ros-tooling/[email protected]
       with:
         package-name: rtabmap
         target-ros2-distro: ${{ matrix.ros_distribution }}
         rosdep-skip-keys: "${{ matrix.skip_keys }}"
-      
+        coverage-result: false
+        extra-cmake-args: -DTEST_DATA_ROOT=${{ steps.testdata.outputs.root }}