From 9732653539ec805dafa192d2af0c79c7ef5c5063 Mon Sep 17 00:00:00 2001 From: Stephanie Eng Date: Fri, 12 Dec 2025 21:07:44 -0500 Subject: [PATCH] Remove CLANG_TIDY_ARGS to support run-clang-tidy (#3640) Also update industrial_ci action to a specific commit hash for stability. (cherry picked from commit 7fd2e4610e596ea3978077f9ea8e7bac672040b3) # Conflicts: # .github/workflows/ci.yaml --- .github/workflows/ci.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 386db77664..74b58c3040 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -30,8 +30,12 @@ jobs: builder_run_build "/opt/ros/${ROS_DISTRO}" "${BASEDIR}/upstream_ws" --packages-select gtest_vendor gmock_vendor env: CXXFLAGS: >- +<<<<<<< HEAD -Wall -Wextra -Wwrite-strings -Wunreachable-code -Wpointer-arith -Wredundant-decls CLANG_TIDY_ARGS: --fix --fix-errors --format-style=file +======= + -Wall -Wextra -Wwrite-strings -Wunreachable-code -Wpointer-arith -Wredundant-decls -Wno-unknown-warning-option +>>>>>>> 7fd2e4610 (Remove CLANG_TIDY_ARGS to support run-clang-tidy (#3640)) DOCKER_IMAGE: moveit/moveit2:${{ matrix.env.IMAGE }} UPSTREAM_WORKSPACE: > moveit2.repos @@ -141,7 +145,7 @@ jobs: run: moveit_kinematics/test/test_ikfast_plugins.sh - id: ici name: Run industrial_ci - uses: ros-industrial/industrial_ci@master + uses: ros-industrial/industrial_ci@ba2a3d0f830f8051b356711a8df2fedfc5d256cf env: ${{ matrix.env }} # NOTE: Testspace is temporarily disabled and needs to be installed for the MoveIt org # See: https://github.com/moveit/moveit2/issues/2852