Skip to content

Commit 944843d

Browse files
authored
Fix rolling (#687)
* Fix rolling Revert "Fix rolling" This reverts commit c808931. Remove ament lint common Remove ament_lint_auto Remove ament_cmake Update Checkout add test Fix package Fix Remove osrf_testing_tools_cpp Update ubuntu Add test_interface_files Revert "Update ubuntu" This reverts commit 3c4939a. Revert "Add test_interface_files" This reverts commit 75f9e21. * Update repos * Add test_interface_files
1 parent 245ecce commit 944843d

6 files changed

Lines changed: 15 additions & 17 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222
with:
2323
path: src/micro_ros_setup
2424

@@ -58,7 +58,7 @@ jobs:
5858
needs: micro_ros_build
5959

6060
steps:
61-
- uses: actions/checkout@v3
61+
- uses: actions/checkout@v4
6262
with:
6363
path: src/micro_ros_setup
6464

@@ -205,7 +205,7 @@ jobs:
205205
binary: 'firmware/micro_ros_mbed/cmake_build/DISCO_L475VG_IOT01A/develop/GCC_ARM/micro_ros_mbed.bin'
206206

207207
steps:
208-
- uses: actions/checkout@v3
208+
- uses: actions/checkout@v4
209209
with:
210210
path: src/micro_ros_setup
211211

.github/workflows/nightly.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
image: ${{ matrix.image }}
3030

3131
steps:
32-
- uses: actions/checkout@v3
32+
- uses: actions/checkout@v4
3333
with:
3434
path: src/micro_ros_setup
3535
ref: ${{ matrix.branch }}
@@ -522,7 +522,7 @@ jobs:
522522
container:
523523
image: ${{ matrix.image }}
524524
steps:
525-
- uses: actions/checkout@v3
525+
- uses: actions/checkout@v4
526526
with:
527527
path: src/micro_ros_setup
528528
ref: ${{ matrix.branch }}
@@ -583,7 +583,7 @@ jobs:
583583
needs: micro_ros_build
584584

585585
steps:
586-
- uses: actions/checkout@v3
586+
- uses: actions/checkout@v4
587587
with:
588588
path: src/micro_ros_setup
589589
ref: ${{ matrix.branch }}

config/host/generic/client_host_packages.repos

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,8 @@ repositories:
5656
type: git
5757
url: https://github.com/ros2/unique_identifier_msgs
5858
version: rolling
59+
60+
ros2/test_interface_files:
61+
type: git
62+
url: https://github.com/ros2/test_interface_files
63+
version: rolling

package.xml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,11 @@
44
<name>micro_ros_setup</name>
55
<version>5.0.0</version>
66
<description>Tools for setting up micro-ROS workspaces</description>
7-
<maintainer email="ingo.luetkebohle@de.bosch.com">Ingo Lütkebohle</maintainer>
7+
<maintainer email="pablogarrido@eprosima.com">Pablo Garrido</maintainer>
88
<license>Apache-2.0</license>
99

10-
<buildtool_depend>ament_cmake</buildtool_depend>
1110
<depend>curl</depend>
1211
<depend>python3-yaml</depend>
13-
<!-- these are needed to build fastrtps -->
14-
<buildtool_depend>asio</buildtool_depend>
15-
<buildtool_depend>tinyxml2</buildtool_depend>
16-
<!-- end fastrtps deps -->
1712
<depend>clang-tidy</depend>
1813

1914
<build_depend>flex</build_depend>
@@ -23,10 +18,8 @@
2318

2419
<exec_depend>python3-vcstool</exec_depend>
2520

26-
<test_depend>ament_lint_auto</test_depend>
27-
<test_depend>ament_lint_common</test_depend>
28-
2921
<export>
3022
<build_type>ament_cmake</build_type>
3123
</export>
24+
3225
</package>

scripts/create_firmware_ws.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ if [ -z ${EXTERNAL_SKIP+x} ]; then
7373
EXTERNAL_SKIP=""
7474
fi
7575

76-
SKIP="microxrcedds_agent microxrcedds_client microcdr rosidl_typesupport_connext_cpp rosidl_typesupport_connext_c rosidl_typesupport_opensplice_cpp rosidl_typesupport_opensplice_c rmw_opensplice_cpp ros-${ROS_DISTRO}-cyclonedds ros-${ROS_DISTRO}-rti-connext-dds-cmake-module ros-${ROS_DISTRO}-rmw-connextdds-common ros-${ROS_DISTRO}-rmw-connextdds ros-${ROS_DISTRO}-rmw-cyclonedds-cpp google_benchmark_vendor performance_test_fixture ros-${ROS_DISTRO}-mimick-vendor rmw_cyclonedds_cpp rmw_connext_cpp rti-connext-dds-5.3.1 rmw_connextdds $EXTERNAL_SKIP"
76+
SKIP="microxrcedds_agent microxrcedds_client microcdr rosidl_typesupport_connext_cpp rosidl_typesupport_connext_c rosidl_typesupport_opensplice_cpp rosidl_typesupport_opensplice_c rmw_opensplice_cpp ros-${ROS_DISTRO}-cyclonedds ros-${ROS_DISTRO}-rti-connext-dds-cmake-module ros-${ROS_DISTRO}-rmw-connextdds-common ros-${ROS_DISTRO}-rmw-connextdds ros-${ROS_DISTRO}-rmw-cyclonedds-cpp google_benchmark_vendor performance_test_fixture ros-${ROS_DISTRO}-mimick-vendor rmw_cyclonedds_cpp rmw_connext_cpp rti-connext-dds-5.3.1 rmw_connextdds osrf_testing_tools_cpp $EXTERNAL_SKIP"
7777

7878
# Check generic build
7979
if [ -d "$PREFIX/config/$RTOS/generic" ]; then

scripts/create_ws.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ then
4040
fi
4141

4242
# ROS_DISTRO SPECIFIC
43-
curl -s https://raw.githubusercontent.com/ros2/ros2/master/ros2.repos |\
43+
curl -s https://raw.githubusercontent.com/ros2/ros2/rolling/ros2.repos |\
4444
ros2 run micro_ros_setup yaml_filter.py ${PACKAGES} > ros2.repos
4545
vcs import --input ros2.repos --skip-existing
4646
vcs import --input $REPOS --skip-existing

0 commit comments

Comments
 (0)