diff --git a/.github/workflows/clang_format.yml b/.github/workflows/clang_format.yml index f929092c..ca955957 100644 --- a/.github/workflows/clang_format.yml +++ b/.github/workflows/clang_format.yml @@ -15,17 +15,18 @@ on: jobs: clang_format: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: Run clang format run: | sudo apt update - sudo apt install -y git clang-format + sudo apt install -y git clang-format-12 if [ $? -ge 1 ]; then return 1; fi ./.run-clang-format if [ $? -ge 1 ]; then return 1; fi - git diff output=$(git diff) + echo $output if [ -n "$output" ]; then exit 1; else exit 0; fi + diff --git a/.run-clang-format b/.run-clang-format index 8509d373..68fc043d 100755 --- a/.run-clang-format +++ b/.run-clang-format @@ -1,2 +1,2 @@ #!/bin/bash -find . -type d \( -name bullet3_ros -o -name fcl_ros -o -name libccd_ros -o -name gtest_ros -o -name tesseract_ext \) -prune -o -type f -regex '.*\.\(cpp\|hpp\|cc\|cxx\|h\|hxx\)' -exec clang-format-10 -style=file -i {} \; +find . -type d \( -name bullet3_ros -o -name fcl_ros -o -name libccd_ros -o -name gtest_ros -o -name tesseract_ext \) -prune -o -type f -regex '.*\.\(cpp\|hpp\|cc\|cxx\|h\|hxx\)' -exec clang-format-12 -style=file -i {} \; diff --git a/tesseract_msgs/msg/PlannerProfileRemapping.msg b/tesseract_msgs/msg/PlannerProfileRemapping.msg deleted file mode 100644 index 8038bb94..00000000 --- a/tesseract_msgs/msg/PlannerProfileRemapping.msg +++ /dev/null @@ -1,2 +0,0 @@ -string[] planner -tesseract_msgs/ProfileMap[] mapping