Uses ros-action-ci in build.yaml workflow.

Signed-off-by: Franco Cipollone <franco.c@ekumenlabs.com>
maliput · Jun 9, 2022 · 65e42b0 · 65e42b0
1 parent 7136af9
commit 65e42b0
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 125 deletions.
diff --git a/.github/dependencies.repos b/.github/dependencies.repos
@@ -3,3 +3,11 @@ repositories:
     type: git
     url: https://github.com/ToyotaResearchInstitute/ament_cmake_doxygen
     version: main
+  maliput:
+    type: git
+    url: https://github.com/maliput/maliput
+    version: main
+  maliput_drake:
+    type: git
+    url: https://github.com/maliput/maliput_drake
+    version: main
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,6 +1,7 @@
 name: gcc
 
 on:
+  push:
   pull_request:
     branches:
       - main
@@ -9,7 +10,6 @@ on:
 env:
   PACKAGE_NAME: maliput_malidrive
   ROS_DISTRO: foxy
-  ROS_WS: maliput_ws
 
 jobs:
   compile_and_test:
@@ -18,90 +18,11 @@ jobs:
     container:
       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
-      env:
-        ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
+    - uses: ros-tooling/setup-ros@v0.3
+    - uses: ros-tooling/action-ros-ci@v0.2
+      id: action_ros_ci_step
       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_drake
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/maliput_drake
-        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
-    - run: colcon graph
-      shell: bash
-      working-directory: ${{ env.ROS_WS }}
-    - name: rosdep install
-      shell: bash
-      working-directory: ${{ env.ROS_WS }}
-      run: |
-        rosdep update --include-eol-distros;
-        rosdep install  -i -y --rosdistro ${ROS_DISTRO} --from-paths src
-    # Build libraries.
-    - name: colcon build libraries
-      shell: bash
-      working-directory: ${{ env.ROS_WS }}
-      run: |
-        . /opt/ros/${ROS_DISTRO}/setup.bash;
-        colcon build --packages-up-to ${PACKAGE_NAME} \
-            --event-handlers=console_direct+ \
-            --cmake-args -DBUILD_TESTING=ON -DBUILD_DOCS=OFF;
-    # Build tests for current package.
-    - name: colcon build tests
-      shell: bash
-      working-directory: ${{ env.ROS_WS }}
-      run: |
-        . /opt/ros/${ROS_DISTRO}/setup.bash;
-        colcon build --packages-select ${PACKAGE_NAME} \
-            --event-handlers=console_direct+ \
-            --cmake-args -DBUILD_TESTING=ON -DBUILD_DOCS=OFF;
-    # Test package.
-    - name: colcon test
-      shell: bash
-      working-directory: ${{ env.ROS_WS }}
-      run: |
-        . /opt/ros/${ROS_DISTRO}/setup.bash;
-        . install/setup.bash;
-        colcon test --packages-select ${PACKAGE_NAME} \
-            --event-handlers=console_direct+;
-        colcon test-result --verbose;
-    # Build documentation.
-    - 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} \
-            --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' ' maliput_malidrive_doxygen_warnings' \
-            --event-handlers=console_direct+;
-        colcon test-result --verbose;
+        package-name: ${{ env.PACKAGE_NAME }}
+        target-ros2-distro: ${{ env.ROS_DISTRO }}
+        vcs-repo-file-url: ${GITHUB_WORKSPACE}/.github/dependencies.repos
diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml
@@ -36,29 +36,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_drake
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/maliput_drake
-        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
@@ -67,6 +50,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 }}

diff --git a/.github/workflows/scan_build.yml b/.github/workflows/scan_build.yml
@@ -23,29 +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_drake
-        fetch-depth: 0
-        path: ${{ env.ROS_WS }}/src/maliput_drake
-        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
@@ -54,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 }}