Skip to content

Fix rolling #687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pablogs9 merged 3 commits into from
Mar 7, 2024
Merged

Fix rolling #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b423ca
Fix rolling
pablogs9 Mar 7, 2024
ae704e1
Update repos
pablogs9 Mar 7, 2024
7698d42
Add test_interface_files
pablogs9 Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: src/micro_ros_setup

Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
needs: micro_ros_build

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: src/micro_ros_setup

Expand Down Expand Up @@ -205,7 +205,7 @@ jobs:
binary: 'firmware/micro_ros_mbed/cmake_build/DISCO_L475VG_IOT01A/develop/GCC_ARM/micro_ros_mbed.bin'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: src/micro_ros_setup

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
image: ${{ matrix.image }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: src/micro_ros_setup
ref: ${{ matrix.branch }}
Expand Down Expand Up @@ -522,7 +522,7 @@ jobs:
container:
image: ${{ matrix.image }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: src/micro_ros_setup
ref: ${{ matrix.branch }}
Expand Down Expand Up @@ -583,7 +583,7 @@ jobs:
needs: micro_ros_build

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: src/micro_ros_setup
ref: ${{ matrix.branch }}
Expand Down
5 changes: 5 additions & 0 deletions config/host/generic/client_host_packages.repos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,8 @@ repositories:
type: git
url: https://github.com/ros2/unique_identifier_msgs
version: rolling

ros2/test_interface_files:
type: git
url: https://github.com/ros2/test_interface_files
version: rolling
11 changes: 2 additions & 9 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,11 @@
<name>micro_ros_setup</name>
<version>5.0.0</version>
<description>Tools for setting up micro-ROS workspaces</description>
<maintainer email="ingo.luetkebohle@de.bosch.com">Ingo Lütkebohle</maintainer>
<maintainer email="pablogarrido@eprosima.com">Pablo Garrido</maintainer>
<license>Apache-2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>
<depend>curl</depend>
<depend>python3-yaml</depend>
<!-- these are needed to build fastrtps -->
<buildtool_depend>asio</buildtool_depend>
<buildtool_depend>tinyxml2</buildtool_depend>
<!-- end fastrtps deps -->
<depend>clang-tidy</depend>

<build_depend>flex</build_depend>
Expand All @@ -23,10 +18,8 @@

<exec_depend>python3-vcstool</exec_depend>

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

<export>
<build_type>ament_cmake</build_type>
</export>

</package>
2 changes: 1 addition & 1 deletion scripts/create_firmware_ws.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ if [ -z ${EXTERNAL_SKIP+x} ]; then
EXTERNAL_SKIP=""
fi

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"
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"

# Check generic build
if [ -d "$PREFIX/config/$RTOS/generic" ]; then
Expand Down
2 changes: 1 addition & 1 deletion scripts/create_ws.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ then
fi

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