Skip to content

Commit

Permalink
ci no symlink
Browse files Browse the repository at this point in the history
  • Loading branch information
antbono committed Apr 15, 2024
1 parent 513576b commit 5ada9cb
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 37 deletions.
13 changes: 4 additions & 9 deletions .github/workflows/build_and_test_humble.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
use-ros2-testing: true
- uses: ros-tooling/[email protected] # symlink-install option
with:
skip-tests: true
target-ros2-distro: humble
colcon-defaults: |
{
"build": {
"symlink-install": false
}
}
no-symlink-install: true
vcs-repo-file-url: dependencies.repos
14 changes: 5 additions & 9 deletions .github/workflows/build_and_test_iron.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
use-ros2-testing: true
#- uses: ros-tooling/[email protected]
- uses: ros-tooling/[email protected] # symlink-install option
with:
skip-tests: true
target-ros2-distro: iron
colcon-defaults: |
{
"build": {
"symlink-install": false
}
}
no-symlink-install: true
vcs-repo-file-url: dependencies.repos
2 changes: 2 additions & 0 deletions .github/workflows/build_and_test_rolling.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ jobs:
with:
use-ros2-testing: true
- 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
9 changes: 2 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -13,8 +13,3 @@ The main new features are two:
- Implementing the request to play a movement as a **ROS2 action**. This gives much more control on the execution and more flexibility.
- Thanks to a new format for describing the gestures, it is possibile to **actuate any subset of the joints**, while before for each gesture you had to take the control of the whole robot. This gives much more flexibility and allows different programs to move the joints if necessary.


### Note on CI

The failing status is due to the colcon `--symlink-install` option that [action-ros-ci](https://github.com/ros-tooling/action-ros-ci) uses. At the moment the symlinking cannot be disabled but we are actively working with action-ros-ci maintainers (see issue [815](https://github.com/ros-tooling/action-ros-ci/issues/815)).

4 changes: 2 additions & 2 deletions nao_pos_interfaces/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ rosidl_generate_interfaces(${PROJECT_NAME}
#ament_export_dependencies(rosidl_default_runtime)

if(BUILD_TESTING)
find_package(ament_lint_auto REQUIRED)
#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)
#set(ament_cmake_cpplint_FOUND TRUE)
ament_lint_auto_find_test_dependencies()
endif()

Expand Down
1 change: 1 addition & 0 deletions nao_pos_interfaces/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
20 changes: 12 additions & 8 deletions nao_pos_server/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
6 changes: 4 additions & 2 deletions nao_pos_server/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@

<buildtool_depend>ament_cmake</buildtool_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>
<test_depend>ament_cmake_clang_format</test_depend>
<depend>rclcpp</depend>
<depend>rclcpp_action</depend>
<depend>rclcpp_components</depend>
Expand All @@ -18,8 +21,7 @@
<depend>ament_index_cpp</depend>
<depend>nao_pos_interfaces</depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>


<export>
<build_type>ament_cmake</build_type>
Expand Down

0 comments on commit 5ada9cb

Please sign in to comment.