Merge branch 'rolling' into clang-tidy-add-extra-arg-option

Author: wuisky

ament_clang_format/CHANGELOG.rst

@@ -2,6 +2,15 @@
 Changelog for package ament_clang_format
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.16.2 (2023-12-26)
+-------------------
+
+0.16.1 (2023-11-06)
+-------------------
+
+0.16.0 (2023-10-04)
+-------------------
+
 0.15.2 (2023-07-11)
 -------------------
 

ament_clang_format/package.xml

@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>ament_clang_format</name>
-  <version>0.15.2</version>
+  <version>0.16.2</version>
   <description>
     The ability to check code against style conventions using
     clang-format and generate xUnit test result files.</description>

ament_clang_format/setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name=package_name,
-    version='0.15.2',
+    version='0.16.2',
     packages=find_packages(exclude=['test']),
     data_files=[
         ('share/' + package_name, ['package.xml']),

ament_clang_tidy/CHANGELOG.rst

@@ -2,6 +2,17 @@
 Changelog for package ament_clang_tidy
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.16.2 (2023-12-26)
+-------------------
+
+0.16.1 (2023-11-06)
+-------------------
+* remove AMENT_IGNORE check in clang-tidy when looking for compilation db (`#441 <https://github.com/ament/ament_lint/issues/441>`_)
+* Contributors: Alberto Soragna
+
+0.16.0 (2023-10-04)
+-------------------
+
 0.15.2 (2023-07-11)
 -------------------
 

ament_clang_tidy/ament_clang_tidy/main.py

@@ -161,8 +161,8 @@ def invoke_clang_tidy(compilation_db_path):
             cmd.append('--extra-arg=' + args.extra_arg)
 
         def is_gtest_source(file_name):
-            if(file_name == 'gtest_main.cc' or file_name == 'gtest-all.cc'
-               or file_name == 'gmock_main.cc' or file_name == 'gmock-all.cc'):
+            if file_name == 'gtest_main.cc' or file_name == 'gtest-all.cc' \
+               or file_name == 'gmock_main.cc' or file_name == 'gmock-all.cc':
                 return True
             return False
 
@@ -288,9 +288,13 @@ def get_compilation_db_files(paths):
     for path in paths:
         if os.path.isdir(path):
             for dirpath, dirnames, filenames in os.walk(path):
-                if 'AMENT_IGNORE' in dirnames + filenames:
-                    dirnames[:] = []
-                    continue
+                # NOTE: here we don't check for the AMENT_IGNORE file.
+                # This function tries to find compile_commands.json file in the build folders.
+                # Build folders always include a AMENT_IGNORE file, so checking for it would
+                # result in not finding any compilation db. The check would also be redundant
+                # because if a source folder was marked with AMENT_IGNORE, then
+                # the compile_commands.json will not be present in relevant build folder.
+
                 # ignore folder starting with . or _
                 dirnames[:] = [d for d in dirnames if d[0] not in ['.', '_']]
                 dirnames.sort()

ament_clang_tidy/package.xml

@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>ament_clang_tidy</name>
-  <version>0.15.2</version>
+  <version>0.16.2</version>
   <description>
     The ability to check code against style conventions using
     clang-tidy and generate xUnit test result files.</description>

ament_clang_tidy/setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name=package_name,
-    version='0.15.2',
+    version='0.16.2',
     packages=find_packages(exclude=['test']),
     data_files=[
         ('share/' + package_name, ['package.xml']),

ament_cmake_clang_format/CHANGELOG.rst

@@ -2,6 +2,15 @@
 Changelog for package ament_cmake_clang_format
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.16.2 (2023-12-26)
+-------------------
+
+0.16.1 (2023-11-06)
+-------------------
+
+0.16.0 (2023-10-04)
+-------------------
+
 0.15.2 (2023-07-11)
 -------------------
 

ament_cmake_clang_format/package.xml

@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>ament_cmake_clang_format</name>
-  <version>0.15.2</version>
+  <version>0.16.2</version>
   <description>
     The CMake API for ament_clang_format to lint C / C++ code using clang format.
   </description>

ament_cmake_clang_tidy/CHANGELOG.rst

@@ -2,6 +2,17 @@
 Changelog for package ament_cmake_clang_tidy
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.16.2 (2023-12-26)
+-------------------
+
+0.16.1 (2023-11-06)
+-------------------
+* Provide --header-filter and --jobs to CMake. (`#450 <https://github.com/ament/ament_lint/issues/450>`_)
+* Contributors: Roderick Taylor
+
+0.16.0 (2023-10-04)
+-------------------
+
 0.15.2 (2023-07-11)
 -------------------