fixup

tesseract-robotics · Nov 10, 2023 · feb7bc8 · feb7bc8
1 parent 56ec44a
commit feb7bc8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml
@@ -45,12 +45,14 @@ jobs:
         run: |
           apt update
           apt upgrade -y
-          apt install -y cmake curl lsb-release ca-certificates gnupg python3 python3-distutils python3-pip ccache git
+          apt install -y cmake curl lsb-release ca-certificates gnupg python3 python3-distutils python3-pip ccache git liboctomap-dev
           python3 -m pip install vcstool -q
           python3 -m pip install colcon-common-extensions -q
+          python3 -m pip install rosdep -q
+          rosdep init
+          rosdep update
           cd $GITHUB_WORKSPACE/target_ws/src
           ./.github/workflows/add_ros_apt_sources.sh
-          apt install -y liboctomap-dev libfcl-dev libconsole-bridge-dev libbullet-dev libbullet-extras-dev libyaml-cpp-dev libtinyxml2-dev libassimp-dev liborocos-kdl-dev libpcl-dev liblapack-dev libboost-dev libboost-filesystem-dev libboost-serialization-dev libboost-program-options-dev libboost-graph-dev libbenchmark-dev libccd-dev libgtest-dev clang-tidy
 
       - name: Prepare ccache timestamp
         id: ccache_cache_timestamp
@@ -74,24 +76,28 @@ jobs:
           mkdir -p $GITHUB_WORKSPACE/upstream_ws/src
           vcs import --input "$GITHUB_WORKSPACE/target_ws/src/dependencies.repos" $GITHUB_WORKSPACE/upstream_ws/src/
           cd $GITHUB_WORKSPACE/upstream_ws
+          rosdep install --from-paths src --ignore-src -r -y
           colcon build --event-handlers console_direct+ --cmake-args -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Release
+          if [ $? -ge 1 ]; then return 1; fi
 
       - name: Build Target Workspace
         shell: bash
         run: |
-          cd $GITHUB_WORKSPACE/target_ws
           source $GITHUB_WORKSPACE/upstream_ws/install/setup.bash
+          cd $GITHUB_WORKSPACE/target_ws
+          rosdep install --from-paths src --ignore-src -r -y
           colcon build --event-handlers console_direct+ --cmake-args -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ${{ env.TARGET_CMAKE_ARGS }}
           if [ $? -ge 1 ]; then return 1; fi
 
       - name: Upload CodeCov Results
         if: ${{ matrix.job_type }} == codecov
         shell: bash
         run: |
-          source $GITHUB_WORKSPACE/target_ws/install/setup.bash
-          cd $GITHUB_WORKSPACE/target_ws
-          colcon build --cmake-target ccov-all --packages-select tesseract_collision tesseract_common tesseract_environment tesseract_geometry tesseract_kinematics tesseract_srdf tesseract_state_solver tesseract_scene_graph tesseract_urdf
-          cd src/tesseract
-          git config --global --add safe.directory $GITHUB_WORKSPACE/target_ws/src/tesseract
-          bash <(curl -s https://codecov.io/bash) -t 758610a6-d851-4185-a01a-5b9465889b62 -s $GITHUB_WORKSPACE/target_ws/build -f *all-merged.info'
-
+          if [[ "${{ matrix.job_type }}" == "codecov" ]]; then
+            source $GITHUB_WORKSPACE/target_ws/install/setup.bash
+            cd $GITHUB_WORKSPACE/target_ws
+            colcon build --cmake-target ccov-all --packages-select tesseract_collision tesseract_common tesseract_environment tesseract_geometry tesseract_kinematics tesseract_srdf tesseract_state_solver tesseract_scene_graph tesseract_urdf
+            cd src/tesseract
+            git config --global --add safe.directory $GITHUB_WORKSPACE/target_ws/src/tesseract
+            bash <(curl -s https://codecov.io/bash) -t 758610a6-d851-4185-a01a-5b9465889b62 -s $GITHUB_WORKSPACE/target_ws/build -f *all-merged.info'
+          fi
diff --git a/.github/workflows/ubuntu_test.yml b/.github/workflows/ubuntu_test.yml
@@ -74,6 +74,7 @@ jobs:
           cd $GITHUB_WORKSPACE/upstream_ws
           rosdep install --from-paths src --ignore-src -r -y
           colcon build --event-handlers console_direct+ --cmake-args -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Release
+          if [ $? -ge 1 ]; then return 1; fi
 
       - name: Build Target Workspace
         shell: bash