Fixes CI.

Signed-off-by: Franco Cipollone <[email protected]>
maliput · Jul 15, 2022 · 1856683 · 1856683
1 parent 0312edd
commit 1856683
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 165 deletions.
diff --git a/.github/dependencies.repos b/.github/dependencies.repos
@@ -3,7 +3,39 @@ repositories:
     type: git
     url: https://github.com/ToyotaResearchInstitute/ament_cmake_doxygen
     version: main
-  pybind11:
+  drake_vendor:
     type: git
-    url: https://github.com/RobotLocomotion/pybind11.git
-    version: c39ede1eedd4f39aa167d7b30b53ae45967c39b7
+    url: https://github.com/maliput/drake_vendor
+    version: main
+  maliput:
+    type: git
+    url: https://github.com/maliput/maliput
+    version: main
+  maliput_dragway:
+    type: git
+    url: https://github.com/maliput/maliput_dragway
+    version: main
+  maliput_drake:
+    type: git
+    url: https://github.com/maliput/maliput_drake
+    version: main
+  maliput_malidrive:
+    type: git
+    url: https://github.com/maliput/maliput_malidrive
+    version: main
+  maliput_multilane:
+    type: git
+    url: https://github.com/maliput/maliput_multilane
+    version: main
+  maliput_py:
+    type: git
+    url: https://github.com/maliput/maliput_py
+    version: main
+  delphyne:
+    type: git
+    url: https://github.com/maliput/delphyne
+    version: main
+  delphyne_gui:
+    type: git
+    url: https://github.com/maliput/delphyne_gui
+    version: main
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,6 +1,7 @@
 name: Compile and test
 
 on:
+  push:
   pull_request:
     branches:
       - main
@@ -19,76 +20,21 @@ jobs:
       image: ubuntu:20.04
     steps:
     # setup-ros first since it installs git, which is needed to fetch all branches from actions/checkout
-    - uses: ros-tooling/setup-ros@0.2.1
+    - uses: ros-tooling/setup-ros@v0.3
       env:
         ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         path: ${{ env.ROS_WS }}/src/${{ env.PACKAGE_NAME }}
-    # clone private dependencies
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/maliput
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/maliput
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/maliput_py
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/maliput_py
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/maliput_malidrive
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/maliput_malidrive
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/maliput_dragway
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/maliput_dragway
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/maliput_multilane
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/maliput_multilane
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/delphyne
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/delphyne
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/delphyne_gui
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/delphyne_gui
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/maliput_drake
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/maiput_drake
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/drake-vendor
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/drake_vendor
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - name: check if dependencies have a matching branch
-      shell: bash
-      working-directory: ${{ env.ROS_WS }}/src
-      run: ./${PACKAGE_NAME}/.github/try_vcs_checkout ${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} .
     # clone public dependencies
     - name: vcs import
       shell: bash
       working-directory: ${{ env.ROS_WS }}
       run: vcs import src < src/${PACKAGE_NAME}/.github/dependencies.repos
+    - name: check if dependencies have a matching branch
+      shell: bash
+      working-directory: ${{ env.ROS_WS }}/src
+      run: ./${PACKAGE_NAME}/.github/try_vcs_checkout ${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} .
     - run: colcon graph
       shell: bash
       working-directory: ${{ env.ROS_WS }}
@@ -97,7 +43,7 @@ jobs:
       working-directory: ${{ env.ROS_WS }}
       run: |
         rosdep update;
-        rosdep install  -i -y --rosdistro ${ROS_DISTRO} --skip-keys "pybind11" --from-paths src
+        rosdep install  -i -y --rosdistro ${ROS_DISTRO} --from-paths src
     - name: install drake
       shell: bash
       working-directory: ${{ env.ROS_WS }}/src/drake_vendor
@@ -138,3 +84,30 @@ jobs:
         . install/setup.bash;
         colcon test --packages-select ${PACKAGE_NAME} --event-handlers=console_direct+;
         colcon test-result --verbose;
+    # Build documentation.
+    - name: colcon build ament_cmake_doxygen
+      shell: bash
+      working-directory: ${{ env.ROS_WS }}
+      run: |
+        . /opt/ros/${ROS_DISTRO}/setup.bash;
+        colcon build --packages-select ament_cmake_doxygen --event-handlers=console_direct+;
+    - name: colcon build doxygen documentation
+      shell: bash
+      working-directory: ${{ env.ROS_WS }}
+      run: |
+        . /opt/ros/${ROS_DISTRO}/setup.bash;
+        . install/setup.bash;
+        colcon build --packages-up-to ${PACKAGE_NAME} --packages-skip ament_cmake_doxygen \
+            --event-handlers=console_direct+ \
+            --cmake-args -DBUILD_TESTING=ON -DBUILD_DOCS=ON;
+    # Test doxygen documentation.
+    - name: colcon test doxygen documentation
+      shell: bash
+      working-directory: ${{ env.ROS_WS }}
+      run: |
+        . /opt/ros/${ROS_DISTRO}/setup.bash;
+        . install/setup.bash;
+        colcon test --packages-select ${PACKAGE_NAME} \
+            --ctest-args ' -R' ' delphyne_demos_doxygen_warnings' \
+            --event-handlers=console_direct+;
+        colcon test-result --verbose;
diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml
@@ -34,71 +34,12 @@ jobs:
       LDFLAGS: -fuse-ld=lld-8
     steps:
     # setup-ros first since it installs git, which is needed to fetch all branches from actions/checkout
-    - uses: ros-tooling/setup-ros@0.2.1
+    - uses: ros-tooling/setup-ros@v0.3
       env:
         ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         path: ${{ env.ROS_WS }}/src/${{ env.PACKAGE_NAME }}
-    # clone private dependencies
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/maliput
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/maliput
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/maliput_py
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/maliput_py
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/maliput_malidrive
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/maliput_malidrive
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/maliput_dragway
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/maliput_dragway
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/maliput_multilane
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/maliput_multilane
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/delphyne
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/delphyne
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/delphyne_gui
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/delphyne_gui
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/maliput_drake
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/maliput_drake
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/drake-vendor
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/drake_vendor
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - name: check if dependencies have a matching branch
-      shell: bash
-      working-directory: ${{ env.ROS_WS }}/src
-      run: ./${PACKAGE_NAME}/.github/try_vcs_checkout ${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} .
     - name: clang 8 install
       shell: bash
       run: ${{ env.ROS_WS }}/src/${PACKAGE_NAME}/.github/clang_suite_installation.sh
@@ -107,6 +48,10 @@ jobs:
       shell: bash
       working-directory: ${{ env.ROS_WS }}
       run: vcs import src < src/${PACKAGE_NAME}/.github/dependencies.repos
+    - name: check if dependencies have a matching branch
+      shell: bash
+      working-directory: ${{ env.ROS_WS }}/src
+      run: ./${PACKAGE_NAME}/.github/try_vcs_checkout ${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} .
     - run: colcon graph
       shell: bash
       working-directory: ${{ env.ROS_WS }}
@@ -115,7 +60,7 @@ jobs:
       working-directory: ${{ env.ROS_WS }}
       run: |
         rosdep update;
-        rosdep install  -i -y --rosdistro ${ROS_DISTRO} --skip-keys "pybind11" --from-paths src
+        rosdep install  -i -y --rosdistro ${ROS_DISTRO} --from-paths src
     - name: install drake
       shell: bash
       working-directory: ${{ env.ROS_WS }}/src/drake_vendor

diff --git a/.github/workflows/scan_build.yml b/.github/workflows/scan_build.yml
@@ -23,47 +23,12 @@ jobs:
       LDFLAGS: -fuse-ld=lld-8
     steps:
     # setup-ros first since it installs git, which is needed to fetch all branches from actions/checkout
-    - uses: ros-tooling/setup-ros@0.2.1
+    - uses: ros-tooling/setup-ros@v0.3
       env:
         ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         path: ${{ env.ROS_WS }}/src/${{ env.PACKAGE_NAME }}
-    # clone private dependencies
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/maliput
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/maliput
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/maliput_py
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/maliput_py
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/delphyne
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/delphyne
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/delphyne_gui
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/delphyne_gui
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - uses: actions/checkout@v2
-      with:
-        repository: ToyotaResearchInstitute/drake-vendor
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/drake_vendor
-        token: ${{ secrets.MALIPUT_TOKEN }}
-    - name: check if dependencies have a matching branch
-      shell: bash
-      working-directory: ${{ env.ROS_WS }}/src
-      run: ./${PACKAGE_NAME}/.github/try_vcs_checkout ${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} .
     - name: clang 8 install
       shell: bash
       run: ${{ env.ROS_WS }}/src/${PACKAGE_NAME}/.github/clang_suite_installation.sh
@@ -72,6 +37,10 @@ jobs:
       shell: bash
       working-directory: ${{ env.ROS_WS }}
       run: vcs import src < src/${PACKAGE_NAME}/.github/dependencies.repos
+    - name: check if dependencies have a matching branch
+      shell: bash
+      working-directory: ${{ env.ROS_WS }}/src
+      run: ./${PACKAGE_NAME}/.github/try_vcs_checkout ${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} .
     - run: colcon graph
       shell: bash
       working-directory: ${{ env.ROS_WS }}
@@ -80,7 +49,7 @@ jobs:
       working-directory: ${{ env.ROS_WS }}
       run: |
         rosdep update;
-        rosdep install  -i -y --rosdistro ${ROS_DISTRO} --skip-keys "pybind11" --from-paths src
+        rosdep install  -i -y --rosdistro ${ROS_DISTRO} --from-paths src
     - name: install drake
       shell: bash
       working-directory: ${{ env.ROS_WS }}/src/drake_vendor