ci no symlink

antbono · Apr 12, 2024 · bc976d4 · bc976d4
1 parent 513576b
commit bc976d4
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 33 deletions.
diff --git a/.github/workflows/build_and_test_humble.yaml b/.github/workflows/build_and_test_humble.yaml
@@ -1,6 +1,6 @@
 # This is a basic workflow to help you get started with Actions
 
-name: Build (humble)
+name: Build and test (humble)
 
 # Controls when the action will run.
 on:
@@ -28,16 +28,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ros-tooling/[email protected]
-        #with:
-        #  use-ros2-testing: true
-      - uses: ros-tooling/[email protected]
         with:
-          skip-tests: true
+          use-ros2-testing: true
+      - uses: ros-tooling/action-ros-ci@christophebedard/option-symlink-install
+        with:
+       #   skip-tests: true
           target-ros2-distro: humble
-          colcon-defaults: |
-            {
-              "build": {
-                "symlink-install": false
-              }
-            }
+          no-symlink-install: true
           vcs-repo-file-url: dependencies.repos
diff --git a/.github/workflows/build_and_test_iron.yaml b/.github/workflows/build_and_test_iron.yaml
@@ -1,6 +1,6 @@
 # This is a basic workflow to help you get started with Actions
 
-name: Build (iron)
+name: Build and test (iron)
 
 # Controls when the action will run.
 on:
@@ -28,16 +28,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ros-tooling/[email protected]
-        #with:
-        # use-ros2-testing: true
-      - uses: ros-tooling/[email protected]
         with:
-          skip-tests: true
+          use-ros2-testing: true
+      #- uses: ros-tooling/[email protected]
+      - uses: ros-tooling/action-ros-ci@christophebedard/option-symlink-install
+        with:
+          #skip-tests: true
           target-ros2-distro: iron
-          colcon-defaults: |
-            {
-              "build": {
-                "symlink-install": false
-              }
-            }
+          no-symlink-install: true
           vcs-repo-file-url: dependencies.repos
diff --git a/.github/workflows/build_and_test_rolling.yaml b/.github/workflows/build_and_test_rolling.yaml
@@ -30,8 +30,10 @@ jobs:
       - uses: ros-tooling/setup-ros@master
         with:
           use-ros2-testing: true
-      - uses: ros-tooling/action-ros-ci@master
+      #- uses: ros-tooling/action-ros-ci@master
+      - uses: ros-tooling/action-ros-ci@christophebedard/option-symlink-install  
         with:
           skip-tests: true
           target-ros2-distro: rolling
+          no-symlink-install: true
           vcs-repo-file-url: dependencies.repos
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-[![Build (humble)](https://github.com/antbono/nao_pos/actions/workflows/build_and_test_humble.yaml/badge.svg)](https://github.com/antbono/nao_pos/actions/workflows/build_and_test_humble.yaml)
-[![Build (iron)](https://github.com/antbono/nao_pos/actions/workflows/build_and_test_iron.yaml/badge.svg)](https://github.com/antbono/nao_pos/actions/workflows/build_and_test_iron.yaml)
+[![Build and test (humble)](https://github.com/antbono/nao_pos/actions/workflows/build_and_test_humble.yaml/badge.svg)](https://github.com/antbono/nao_pos/actions/workflows/build_and_test_humble.yaml)
+[![Build and test (iron)](https://github.com/antbono/nao_pos/actions/workflows/build_and_test_iron.yaml/badge.svg)](https://github.com/antbono/nao_pos/actions/workflows/build_and_test_iron.yaml)
 [![Build (rolling)](https://github.com/antbono/nao_pos/actions/workflows/build_and_test_rolling.yaml/badge.svg)](https://github.com/antbono/nao_pos/actions/workflows/build_and_test_rolling.yaml)
 
 # nao_pos

diff --git a/nao_pos_interfaces/package.xml b/nao_pos_interfaces/package.xml
@@ -11,6 +11,7 @@
 
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>
+  <test_depend>ament_cmake_clang_format</test_depend>
 
   <build_depend>rosidl_default_generators</build_depend>
   <exec_depend>rosidl_default_runtime</exec_depend>

diff --git a/nao_pos_server/CMakeLists.txt b/nao_pos_server/CMakeLists.txt
@@ -189,13 +189,17 @@ install(DIRECTORY
 )
 
 
-# Test
-#if(BUILD_TESTING)
-#  find_package(ament_cmake_gtest REQUIRED)
-#  add_subdirectory(test)
-
-#  find_package(ament_lint_auto REQUIRED)
-#  ament_lint_auto_find_test_dependencies()
-#endif()
+#################### TEST ###############################
+if(BUILD_TESTING)
+find_package(ament_lint_auto REQUIRED)
+# the following line skips the linter which checks for copyrights
+# comment the line when a copyright and license is added to all source files
+set(ament_cmake_copyright_FOUND TRUE)
+  # the following line skips cpplint (only works in a git repo)
+  # comment the line when this package is in a git repo and when
+  # a copyright and license is added to all source files
+  set(ament_cmake_cpplint_FOUND TRUE)
+  ament_lint_auto_find_test_dependencies()
+endif()
 
 ament_package()
diff --git a/nao_pos_server/package.xml b/nao_pos_server/package.xml
@@ -20,6 +20,7 @@
 
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>
+  <test_depend>ament_cmake_clang_format</test_depend>
 
   <export>
     <build_type>ament_cmake</build_type>