Skip to content

Commit 4c608d8

Browse files
authored
Bump lyrical (#841)
Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com>
1 parent 688d9cc commit 4c608d8

16 files changed

Lines changed: 60 additions & 69 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
description: "Manual trigger"
1313

1414
env:
15-
ROS_DISTRO: rolling
15+
ROS_DISTRO: lyrical
1616
# Pinned to avoid a flaky api.github.com lookup for the latest release
1717
# Keep it updated with the latest version from
1818
# https://github.com/ros-infrastructure/ros-apt-source/releases
@@ -38,16 +38,12 @@ jobs:
3838
- name: Install ROS apt source
3939
run: |
4040
apt-get update && apt-get install -y ca-certificates curl
41-
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
41+
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
4242
apt-get install -y /tmp/ros2-apt-source.deb
4343
4444
- uses: ros-tooling/setup-ros@0.7.19
4545
with:
46-
# Rolling binaries for Ubuntu Resolute are only published to the
47-
# ros2-testing repository; the main repository currently ships
48-
# Lyrical only
49-
# Revert once Rolling syncs to the main repository
50-
use-ros2-testing: true
46+
use-ros2-testing: false
5147
required-ros-distributions: ${{ env.ROS_DISTRO }}
5248

5349
- name: Dependencies
@@ -96,16 +92,12 @@ jobs:
9692
- name: Install ROS apt source
9793
run: |
9894
apt-get update && apt-get install -y ca-certificates curl
99-
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
95+
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
10096
apt-get install -y /tmp/ros2-apt-source.deb
10197
10298
- uses: ros-tooling/setup-ros@0.7.19
10399
with:
104-
# Rolling binaries for Ubuntu Resolute are only published to the
105-
# ros2-testing repository; the main repository currently ships
106-
# Lyrical only
107-
# Revert once Rolling syncs to the main repository
108-
use-ros2-testing: true
100+
use-ros2-testing: false
109101
required-ros-distributions: ${{ env.ROS_DISTRO }}
110102

111103
- name: dependencies
@@ -257,16 +249,12 @@ jobs:
257249
- name: Install ROS apt source
258250
run: |
259251
apt-get update && apt-get install -y ca-certificates curl
260-
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
252+
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
261253
apt-get install -y /tmp/ros2-apt-source.deb
262254
263255
- uses: ros-tooling/setup-ros@0.7.19
264256
with:
265-
# Rolling binaries for Ubuntu Resolute are only published to the
266-
# ros2-testing repository; the main repository currently ships
267-
# Lyrical only
268-
# Revert once Rolling syncs to the main repository
269-
use-ros2-testing: true
257+
use-ros2-testing: false
270258
required-ros-distributions: ${{ env.ROS_DISTRO }}
271259

272260
- name: Dependencies

‎config/agent_uros_packages.repos‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ repositories:
22
uros/micro_ros_msgs:
33
type: git
44
url: https://github.com/micro-ROS/micro_ros_msgs.git
5-
version: rolling
5+
version: lyrical
66
uros/micro-ROS-Agent:
77
type: git
88
url: https://github.com/micro-ROS/micro-ROS-Agent.git
9-
version: rolling
9+
version: lyrical
1010
uros/drive_base:
1111
type: git
1212
url: https://github.com/micro-ROS/drive_base.git

‎config/android/generic/client_uros_packages.repos‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,46 +2,47 @@ repositories:
22
eProsima/Micro-CDR:
33
type: git
44
url: https://github.com/eProsima/Micro-CDR.git
5-
version: ros2
5+
version: v2.0.2
66
eProsima/Micro-XRCE-DDS-Client:
77
type: git
88
url: https://github.com/eProsima/Micro-XRCE-DDS-Client.git
9-
version: ros2
9+
version: v3.0.2
1010

1111
# MicroROS
1212
uros/rcl:
1313
type: git
1414
url: https://github.com/micro-ROS/rcl
15-
version: rolling
15+
version: lyrical
16+
# TEMPORARY: switch back to ros2/rclc once it has a lyrical branch
1617
uros/rclc:
1718
type: git
18-
url: https://github.com/ros2/rclc
19-
version: rolling
19+
url: https://github.com/eProsima/rclc
20+
version: lyrical
2021
uros/micro_ros_utilities:
2122
type: git
2223
url: https://github.com/micro-ROS/micro_ros_utilities
23-
version: rolling
24+
version: lyrical
2425
uros/rcutils:
2526
type: git
2627
url: https://github.com/micro-ROS/rcutils
27-
version: rolling
28+
version: lyrical
2829
uros/micro_ros_msgs:
2930
type: git
3031
url: https://github.com/micro-ROS/micro_ros_msgs.git
31-
version: rolling
32+
version: lyrical
3233
uros/rmw_microxrcedds:
3334
type: git
3435
url: https://github.com/micro-ROS/rmw-microxrcedds.git
35-
version: rolling
36+
version: lyrical
3637
uros/rosidl_typesupport:
3738
type: git
3839
url: https://github.com/micro-ROS/rosidl_typesupport.git
39-
version: rolling
40+
version: lyrical
4041
uros/rosidl_typesupport_microxrcedds:
4142
type: git
4243
url: https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git
43-
version: rolling
44+
version: lyrical
4445
uros/micro-ROS-demos:
4546
type: git
4647
url: https://github.com/micro-ROS/micro-ROS-demos.git
47-
version: rolling
48+
version: lyrical

‎config/client_uros_packages.repos‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,43 @@ repositories:
22
eProsima/Micro-CDR:
33
type: git
44
url: https://github.com/eProsima/Micro-CDR.git
5-
version: ros2
5+
version: v2.0.2
66
eProsima/Micro-XRCE-DDS-Client:
77
type: git
88
url: https://github.com/eProsima/Micro-XRCE-DDS-Client.git
9-
version: ros2
9+
version: v3.0.2
1010

1111
# MicroROS
1212
uros/rcl:
1313
type: git
1414
url: https://github.com/micro-ROS/rcl
15-
version: rolling
15+
version: lyrical
16+
# TEMPORARY: switch back to ros2/rclc once it has a lyrical branch
1617
uros/rclc:
1718
type: git
18-
url: https://github.com/ros2/rclc
19-
version: rolling
19+
url: https://github.com/eProsima/rclc
20+
version: lyrical
2021
uros/micro_ros_utilities:
2122
type: git
2223
url: https://github.com/micro-ROS/micro_ros_utilities
23-
version: rolling
24+
version: lyrical
2425
uros/rcutils:
2526
type: git
2627
url: https://github.com/micro-ROS/rcutils
27-
version: rolling
28+
version: lyrical
2829
uros/micro_ros_msgs:
2930
type: git
3031
url: https://github.com/micro-ROS/micro_ros_msgs.git
31-
version: rolling
32+
version: lyrical
3233
uros/rmw_microxrcedds:
3334
type: git
3435
url: https://github.com/micro-ROS/rmw-microxrcedds.git
35-
version: rolling
36+
version: lyrical
3637
uros/rosidl_typesupport:
3738
type: git
3839
url: https://github.com/micro-ROS/rosidl_typesupport.git
39-
version: rolling
40+
version: lyrical
4041
uros/rosidl_typesupport_microxrcedds:
4142
type: git
4243
url: https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git
43-
version: rolling
44+
version: lyrical

‎config/freertos/crazyflie21/board.repos‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ repositories:
77
freertos_apps:
88
type: git
99
url: https://github.com/micro-ROS/freertos_apps
10-
version: rolling
10+
version: lyrical
1111

‎config/freertos/esp32/board.repos‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ repositories:
22
freertos_apps:
33
type: git
44
url: https://github.com/micro-ROS/freertos_apps
5-
version: rolling
5+
version: lyrical
66

77

88

‎config/freertos/nucleo_f446re/board.repos‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ repositories:
22
freertos_apps:
33
type: git
44
url: https://github.com/micro-ros/freertos_apps
5-
version: rolling
5+
version: lyrical

‎config/freertos/nucleo_f446ze/board.repos‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ repositories:
22
freertos_apps:
33
type: git
44
url: https://github.com/micro-ros/freertos_apps
5-
version: rolling
5+
version: lyrical

‎config/freertos/nucleo_f746zg/board.repos‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ repositories:
22
freertos_apps:
33
type: git
44
url: https://github.com/micro-ros/freertos_apps
5-
version: rolling
5+
version: lyrical

‎config/freertos/nucleo_f767zi/board.repos‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ repositories:
22
freertos_apps:
33
type: git
44
url: https://github.com/micro-ros/freertos_apps
5-
version: rolling
5+
version: lyrical

0 commit comments

Comments
 (0)