Removed catkin_lint buildfarm hacks. Hopefully it will work after cat…

…kin_lint 1.6.22 has been released.
ctu-vras · Feb 27, 2024 · cbf7a8f · cbf7a8f
1 parent 75272b3
commit cbf7a8f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 49 deletions.
diff --git a/gnss_info/CMakeLists.txt b/gnss_info/CMakeLists.txt
@@ -79,22 +79,7 @@ install(DIRECTORY data/ DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/data)
 if (CATKIN_ENABLE_TESTING)
   find_package(roslint REQUIRED)
 
-  # catkin_lint - checks validity of package.xml and CMakeLists.txt
-  # ROS buildfarm calls this without any environment and with empty rosdep cache,
-  # so we have problems reading the list of packages from env
-  # see https://github.com/ros-infrastructure/ros_buildfarm/issues/923
-  if(DEFINED ENV{ROS_HOME})
-    #catkin_lint: ignore_once env_var
-    set(ROS_HOME "$ENV{ROS_HOME}")
-  else()
-    #catkin_lint: ignore_once env_var
-    set(ROS_HOME "$ENV{HOME}/.ros")
-  endif()
-
-  #catkin_lint: ignore_once env_var
-  if(DEFINED ENV{ROS_ROOT} AND EXISTS "${ROS_HOME}/rosdep/sources.cache")
-    roslint_custom(catkin_lint "-W2" .)
-  endif()
+  roslint_custom(catkin_lint "-W2" .)
 
   # Roslint C++ - checks formatting and some other rules for C++ files
   file(GLOB_RECURSE ROSLINT_SRC src/*.cpp include/${PROJECT_NAME}/*.h nodes/*.cpp test/*.cpp)

diff --git a/gnss_info_msgs/CMakeLists.txt b/gnss_info_msgs/CMakeLists.txt
@@ -39,21 +39,6 @@ catkin_package(
 if (CATKIN_ENABLE_TESTING)
   find_package(roslint REQUIRED)
 
-  # catkin_lint - checks validity of package.xml and CMakeLists.txt
-  # ROS buildfarm calls this without any environment and with empty rosdep cache,
-  # so we have problems reading the list of packages from env
-  # see https://github.com/ros-infrastructure/ros_buildfarm/issues/923
-  if(DEFINED ENV{ROS_HOME})
-    #catkin_lint: ignore_once env_var
-    set(ROS_HOME "$ENV{ROS_HOME}")
-  else()
-    #catkin_lint: ignore_once env_var
-    set(ROS_HOME "$ENV{HOME}/.ros")
-  endif()
-
-  #catkin_lint: ignore_once env_var
-  if(DEFINED ENV{ROS_ROOT} AND EXISTS "${ROS_HOME}/rosdep/sources.cache")
-    roslint_custom(catkin_lint "-W2" .)
-    roslint_add_test()
-  endif()
+  roslint_custom(catkin_lint "-W2" .)
+  roslint_add_test()
 endif()
diff --git a/gnsstk_ros/CMakeLists.txt b/gnsstk_ros/CMakeLists.txt
@@ -40,22 +40,7 @@ install(DIRECTORY include/${PROJECT_NAME}/
 if (CATKIN_ENABLE_TESTING)
   find_package(roslint REQUIRED)
 
-  # catkin_lint - checks validity of package.xml and CMakeLists.txt
-  # ROS buildfarm calls this without any environment and with empty rosdep cache,
-  # so we have problems reading the list of packages from env
-  # see https://github.com/ros-infrastructure/ros_buildfarm/issues/923
-  if(DEFINED ENV{ROS_HOME})
-    #catkin_lint: ignore_once env_var
-    set(ROS_HOME "$ENV{ROS_HOME}")
-  else()
-    #catkin_lint: ignore_once env_var
-    set(ROS_HOME "$ENV{HOME}/.ros")
-  endif()
-
-  #catkin_lint: ignore_once env_var
-  if(DEFINED ENV{ROS_ROOT} AND EXISTS "${ROS_HOME}/rosdep/sources.cache")
-    roslint_custom(catkin_lint "-W2" .)
-  endif()
+  roslint_custom(catkin_lint "-W2" .)
 
   # Roslint C++ - checks formatting and some other rules for C++ files
   file(GLOB_RECURSE ROSLINT_SRC src/*.cpp include/${PROJECT_NAME}/*.h)