Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 7 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
description: "Manual trigger"

env:
ROS_DISTRO: rolling
ROS_DISTRO: lyrical
# Pinned to avoid a flaky api.github.com lookup for the latest release
# Keep it updated with the latest version from
# https://github.com/ros-infrastructure/ros-apt-source/releases
Expand All @@ -38,16 +38,12 @@ jobs:
- name: Install ROS apt source
run: |
apt-get update && apt-get install -y ca-certificates curl
curl -fL -o /tmp/ros2-apt-source.deb https://github.com/ros-infrastructure/ros-apt-source/releases/download/${ROS_APT_SOURCE_VERSION}/ros2-testing-apt-source_${ROS_APT_SOURCE_VERSION}.resolute_all.deb
curl -fL -o /tmp/ros2-apt-source.deb https://github.com/ros-infrastructure/ros-apt-source/releases/download/${ROS_APT_SOURCE_VERSION}/ros2-apt-source_${ROS_APT_SOURCE_VERSION}.resolute_all.deb
apt-get install -y /tmp/ros2-apt-source.deb

- uses: ros-tooling/setup-ros@0.7.19
with:
# Rolling binaries for Ubuntu Resolute are only published to the
# ros2-testing repository; the main repository currently ships
# Lyrical only
# Revert once Rolling syncs to the main repository
use-ros2-testing: true
use-ros2-testing: false
required-ros-distributions: ${{ env.ROS_DISTRO }}

- name: Dependencies
Expand Down Expand Up @@ -96,16 +92,12 @@ jobs:
- name: Install ROS apt source
run: |
apt-get update && apt-get install -y ca-certificates curl
curl -fL -o /tmp/ros2-apt-source.deb https://github.com/ros-infrastructure/ros-apt-source/releases/download/${ROS_APT_SOURCE_VERSION}/ros2-testing-apt-source_${ROS_APT_SOURCE_VERSION}.resolute_all.deb
curl -fL -o /tmp/ros2-apt-source.deb https://github.com/ros-infrastructure/ros-apt-source/releases/download/${ROS_APT_SOURCE_VERSION}/ros2-apt-source_${ROS_APT_SOURCE_VERSION}.resolute_all.deb
apt-get install -y /tmp/ros2-apt-source.deb

- uses: ros-tooling/setup-ros@0.7.19
with:
# Rolling binaries for Ubuntu Resolute are only published to the
# ros2-testing repository; the main repository currently ships
# Lyrical only
# Revert once Rolling syncs to the main repository
use-ros2-testing: true
use-ros2-testing: false
required-ros-distributions: ${{ env.ROS_DISTRO }}

- name: dependencies
Expand Down Expand Up @@ -257,16 +249,12 @@ jobs:
- name: Install ROS apt source
run: |
apt-get update && apt-get install -y ca-certificates curl
curl -fL -o /tmp/ros2-apt-source.deb https://github.com/ros-infrastructure/ros-apt-source/releases/download/${ROS_APT_SOURCE_VERSION}/ros2-testing-apt-source_${ROS_APT_SOURCE_VERSION}.resolute_all.deb
curl -fL -o /tmp/ros2-apt-source.deb https://github.com/ros-infrastructure/ros-apt-source/releases/download/${ROS_APT_SOURCE_VERSION}/ros2-apt-source_${ROS_APT_SOURCE_VERSION}.resolute_all.deb
apt-get install -y /tmp/ros2-apt-source.deb

- uses: ros-tooling/setup-ros@0.7.19
with:
# Rolling binaries for Ubuntu Resolute are only published to the
# ros2-testing repository; the main repository currently ships
# Lyrical only
# Revert once Rolling syncs to the main repository
use-ros2-testing: true
use-ros2-testing: false
required-ros-distributions: ${{ env.ROS_DISTRO }}

- name: Dependencies
Expand Down
4 changes: 2 additions & 2 deletions config/agent_uros_packages.repos
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ repositories:
uros/micro_ros_msgs:
type: git
url: https://github.com/micro-ROS/micro_ros_msgs.git
version: rolling
version: lyrical
uros/micro-ROS-Agent:
type: git
url: https://github.com/micro-ROS/micro-ROS-Agent.git
version: rolling
version: lyrical
uros/drive_base:
type: git
url: https://github.com/micro-ROS/drive_base.git
Expand Down
25 changes: 13 additions & 12 deletions config/android/generic/client_uros_packages.repos
Original file line number Diff line number Diff line change
Expand Up @@ -2,46 +2,47 @@ repositories:
eProsima/Micro-CDR:
type: git
url: https://github.com/eProsima/Micro-CDR.git
version: ros2
version: v2.0.2
eProsima/Micro-XRCE-DDS-Client:
type: git
url: https://github.com/eProsima/Micro-XRCE-DDS-Client.git
version: ros2
version: v3.0.2

# MicroROS
uros/rcl:
type: git
url: https://github.com/micro-ROS/rcl
version: rolling
version: lyrical
# TEMPORARY: switch back to ros2/rclc once it has a lyrical branch
uros/rclc:
type: git
url: https://github.com/ros2/rclc
version: rolling
url: https://github.com/eProsima/rclc
version: lyrical
uros/micro_ros_utilities:
type: git
url: https://github.com/micro-ROS/micro_ros_utilities
version: rolling
version: lyrical
uros/rcutils:
type: git
url: https://github.com/micro-ROS/rcutils
version: rolling
version: lyrical
uros/micro_ros_msgs:
type: git
url: https://github.com/micro-ROS/micro_ros_msgs.git
version: rolling
version: lyrical
uros/rmw_microxrcedds:
type: git
url: https://github.com/micro-ROS/rmw-microxrcedds.git
version: rolling
version: lyrical
uros/rosidl_typesupport:
type: git
url: https://github.com/micro-ROS/rosidl_typesupport.git
version: rolling
version: lyrical
uros/rosidl_typesupport_microxrcedds:
type: git
url: https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git
version: rolling
version: lyrical
uros/micro-ROS-demos:
type: git
url: https://github.com/micro-ROS/micro-ROS-demos.git
version: rolling
version: lyrical
23 changes: 12 additions & 11 deletions config/client_uros_packages.repos
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,43 @@ repositories:
eProsima/Micro-CDR:
type: git
url: https://github.com/eProsima/Micro-CDR.git
version: ros2
version: v2.0.2
eProsima/Micro-XRCE-DDS-Client:
type: git
url: https://github.com/eProsima/Micro-XRCE-DDS-Client.git
version: ros2
version: v3.0.2

# MicroROS
uros/rcl:
type: git
url: https://github.com/micro-ROS/rcl
version: rolling
version: lyrical
# TEMPORARY: switch back to ros2/rclc once it has a lyrical branch
uros/rclc:
type: git
url: https://github.com/ros2/rclc
version: rolling
url: https://github.com/eProsima/rclc
version: lyrical
uros/micro_ros_utilities:
type: git
url: https://github.com/micro-ROS/micro_ros_utilities
version: rolling
version: lyrical
uros/rcutils:
type: git
url: https://github.com/micro-ROS/rcutils
version: rolling
version: lyrical
uros/micro_ros_msgs:
type: git
url: https://github.com/micro-ROS/micro_ros_msgs.git
version: rolling
version: lyrical
uros/rmw_microxrcedds:
type: git
url: https://github.com/micro-ROS/rmw-microxrcedds.git
version: rolling
version: lyrical
uros/rosidl_typesupport:
type: git
url: https://github.com/micro-ROS/rosidl_typesupport.git
version: rolling
version: lyrical
uros/rosidl_typesupport_microxrcedds:
type: git
url: https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git
version: rolling
version: lyrical
2 changes: 1 addition & 1 deletion config/freertos/crazyflie21/board.repos
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ repositories:
freertos_apps:
type: git
url: https://github.com/micro-ROS/freertos_apps
version: rolling
version: lyrical

2 changes: 1 addition & 1 deletion config/freertos/esp32/board.repos
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ repositories:
freertos_apps:
type: git
url: https://github.com/micro-ROS/freertos_apps
version: rolling
version: lyrical



2 changes: 1 addition & 1 deletion config/freertos/nucleo_f446re/board.repos
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ repositories:
freertos_apps:
type: git
url: https://github.com/micro-ros/freertos_apps
version: rolling
version: lyrical
2 changes: 1 addition & 1 deletion config/freertos/nucleo_f446ze/board.repos
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ repositories:
freertos_apps:
type: git
url: https://github.com/micro-ros/freertos_apps
version: rolling
version: lyrical
2 changes: 1 addition & 1 deletion config/freertos/nucleo_f746zg/board.repos
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ repositories:
freertos_apps:
type: git
url: https://github.com/micro-ros/freertos_apps
version: rolling
version: lyrical
2 changes: 1 addition & 1 deletion config/freertos/nucleo_f767zi/board.repos
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ repositories:
freertos_apps:
type: git
url: https://github.com/micro-ros/freertos_apps
version: rolling
version: lyrical
2 changes: 1 addition & 1 deletion config/freertos/olimex-stm32-e407/board.repos
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ repositories:
freertos_apps:
type: git
url: https://github.com/micro-ROS/freertos_apps
version: rolling
version: lyrical



29 changes: 15 additions & 14 deletions config/host/generic/client_host_packages.repos
Original file line number Diff line number Diff line change
Expand Up @@ -2,62 +2,63 @@ repositories:
eProsima/Micro-CDR:
type: git
url: https://github.com/eProsima/Micro-CDR.git
version: ros2
version: v2.0.2
eProsima/Micro-XRCE-DDS-Client:
type: git
url: https://github.com/eProsima/Micro-XRCE-DDS-Client.git
version: ros2
version: v3.0.2

# MicroROS

# TEMPORARY: switch back to ros2/rclc once it has a lyrical branch
uros/rclc:
type: git
url: https://github.com/ros2/rclc.git
version: rolling
url: https://github.com/eProsima/rclc.git
version: lyrical
uros/micro_ros_msgs:
type: git
url: https://github.com/micro-ROS/micro_ros_msgs.git
version: rolling
version: lyrical
uros/rmw_microxrcedds:
type: git
url: https://github.com/micro-ROS/rmw-microxrcedds.git
version: rolling
version: lyrical
uros/rosidl_typesupport_microxrcedds:
type: git
url: https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git
version: rolling
version: lyrical
uros/micro-ROS-demos:
type: git
url: https://github.com/micro-ROS/micro-ROS-demos.git
version: rolling
version: lyrical
uros/micro_ros_utilities:
type: git
url: https://github.com/micro-ROS/micro_ros_utilities
version: rolling
version: lyrical

# Required messages packages

ros2/common_interfaces:
type: git
url: https://github.com/ros2/common_interfaces
version: rolling
version: lyrical

ros2/example_interfaces:
type: git
url: https://github.com/ros2/example_interfaces
version: rolling
version: lyrical

ros2/rcl_interfaces:
type: git
url: https://github.com/ros2/rcl_interfaces
version: rolling
version: lyrical

ros2/unique_identifier_msgs:
type: git
url: https://github.com/ros2/unique_identifier_msgs
version: rolling
version: lyrical

ros2/test_interface_files:
type: git
url: https://github.com/ros2/test_interface_files
version: rolling
version: lyrical
2 changes: 1 addition & 1 deletion config/raspbian/generic/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pushd $FW_TARGETDIR >/dev/null
rm -rf mcu_ws/*
cp raspbian_apps/toolchain.cmake mcu_ws/
# ROS_DISTRO SPECIFIC
curl -s https://raw.githubusercontent.com/ros2/ros2/rolling/ros2.repos |\
curl -s https://raw.githubusercontent.com/ros2/ros2/lyrical/ros2.repos |\
ros2 run micro_ros_setup yaml_filter.py raspbian_apps/$CONFIG_NAME/ros2_repos.filter > ros2.repos
vcs import --input ros2.repos mcu_ws/ && rm ros2.repos

Expand Down
2 changes: 1 addition & 1 deletion config/raspbian/generic/create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ pushd $FW_TARGETDIR/$DEV_WS_DIR >/dev/null
popd >/dev/null

pushd $FW_TARGETDIR >/dev/null
git clone -b rolling https://github.com/micro-ROS/raspbian_apps.git
git clone -b lyrical https://github.com/micro-ROS/raspbian_apps.git
popd >/dev/null
2 changes: 1 addition & 1 deletion config/zephyr/generic/board.repos
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ repositories:
zephyr_apps:
type: git
url: https://github.com/micro-ROS/zephyr_apps
version: rolling
version: lyrical
2 changes: 1 addition & 1 deletion scripts/create_ws.sh
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/rolling/ros2.repos |\
curl -s https://raw.githubusercontent.com/ros2/ros2/lyrical/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
Loading