try PR to industrial_ci for PR

moveit · Mar 24, 2021 · dc4615a · dc4615a
1 parent fa3660e
commit dc4615a
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml
@@ -1,6 +1,16 @@
 # This config uses industrial_ci (https://github.com/ros-industrial/industrial_ci.git).
 # For troubleshooting, see readme (https://github.com/ros-industrial/industrial_ci/blob/master/README.rst)
 
+# ros2 run industrial_ci rerun_ci ~/code/moveit2/ws_moveit2/src/moveit_calibration \
+#   DOCKER_IMAGE='moveit/moveit:melodic-source' \
+#   UPSTREAM_WORKSPACE='upstream.rosinstall' \
+#   BEFORE_INSTALL_UPSTREAM_DEPENDENCIES_EMBED='set +u && source /root/ws_moveit/install/setup.bash && set -u' \
+#   UNDERLAY='/root/ws_moveit' \
+#   TARGET_CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=1" \
+#   CCACHE_DIR=".ccache" \
+#   CLANG_TIDY=true \
+#   CLANG_TIDY_BASE_REF=master
+
 name: BuildAndTest
 
 on:
@@ -16,12 +26,13 @@ jobs:
       DOCKER_IMAGE: 'moveit/moveit:melodic-source'
       UPSTREAM_WORKSPACE: 'upstream.rosinstall'
       BEFORE_INSTALL_UPSTREAM_DEPENDENCIES_EMBED: 'set +u && source /root/ws_moveit/install/setup.bash && set -u'
-      BEFORE_RUN_TARGET_TEST: './.ci.clang_tidy2'
       AFTER_RUN_TARGET_TEST: './.ci.prepare_codecov'
       TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS='--coverage' -DCMAKE_CXX_FLAGS='--coverage' -DCMAKE_EXPORT_COMPILE_COMMANDS=1"
-      ADDITIONAL_DEBS: 'lcov git clang-tidy-10 grep ros-melodic-catkin'
+      ADDITIONAL_DEBS: 'lcov'
       CCACHE_DIR: "${{ github.workspace }}/.ccache"
       BASEDIR: ${{ github.workspace }}/.work
+      CLANG_TIDY: true
+      CLANG_TIDY_BASE_REF: 'master'
 
     runs-on: ubuntu-latest
     steps:
@@ -50,7 +61,7 @@ jobs:
             ccache-${{ github.sha }}
             ccache
       - name: industrial_ci
-        uses: 'ros-industrial/industrial_ci@master'
+        uses: 'tylerjw/industrial_ci@clang-tidy-modified-filter'
       - name: upload test artifacts (on failure)
         uses: actions/upload-artifact@v2
         if: failure()