Skip to content

Commit d14d5bd

Browse files
pablogs9pablogs9
authored
Bump jazzy (#16)
* Bump jazzy * Bump ubuntu * Fix pip * Bump flags
1 parent f83776e commit d14d5bd

File tree

3 files changed

+29
-29
lines changed

3 files changed

+29
-29
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
micro_ros_azure_app:
1717
runs-on: ubuntu-latest
18-
container: ubuntu:20.04
18+
container: ubuntu:24.04
1919
strategy:
2020
matrix:
2121
azure_rtos_version: [v6.1.7_rel]
@@ -27,7 +27,7 @@ jobs:
2727
apt update
2828
export DEBIAN_FRONTEND=noninteractive
2929
apt install -y --no-install-recommends git build-essential gcc-arm-none-eabi python3-pip cmake ninja-build libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib g++-multilib gcc-multilib binutils-arm-none-eabi
30-
pip3 install catkin_pkg lark-parser colcon-common-extensions
30+
pip3 install catkin_pkg lark-parser colcon-common-extensions --break-system-packages
3131
- uses: actions/checkout@v2
3232
with:
3333
path: repo

‎cmake/arm-gcc-cortex-m4.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
set(THREADX_ARCH "cortex_m4")
66
set(THREADX_TOOLCHAIN "gnu")
77

8-
set(MCPU_FLAGS "-mthumb -mcpu=cortex-m4")
8+
set(MCPU_FLAGS "-mthumb -mcpu=cortex-m4 -Wno-address")
99
set(VFP_FLAGS "-mfloat-abi=hard -mfpu=fpv4-sp-d16")
1010

1111
include(${CMAKE_CURRENT_LIST_DIR}/arm-gcc-cortex-toolchain.cmake)

‎microros/libmicroros.mk‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -37,39 +37,39 @@ $(EXTENSIONS_DIR)/toolchain.cmake: $(EXTENSIONS_DIR)/toolchain.cmake.in
3737
$(EXTENSIONS_DIR)/micro_ros_dev/install:
3838
@rm -rf micro_ros_dev; \
3939
mkdir micro_ros_dev; cd micro_ros_dev; \
40-
git clone -b rolling https://github.com/ament/ament_cmake src/ament_cmake; \
41-
git clone -b rolling https://github.com/ament/ament_lint src/ament_lint; \
42-
git clone -b rolling https://github.com/ament/ament_package src/ament_package; \
43-
git clone -b rolling https://github.com/ament/googletest src/googletest; \
44-
git clone -b rolling https://github.com/ros2/ament_cmake_ros src/ament_cmake_ros; \
45-
git clone -b rolling https://github.com/ament/ament_index src/ament_index; \
40+
git clone -b jazzy https://github.com/ament/ament_cmake src/ament_cmake; \
41+
git clone -b jazzy https://github.com/ament/ament_lint src/ament_lint; \
42+
git clone -b jazzy https://github.com/ament/ament_package src/ament_package; \
43+
git clone -b jazzy https://github.com/ament/googletest src/googletest; \
44+
git clone -b jazzy https://github.com/ros2/ament_cmake_ros src/ament_cmake_ros; \
45+
git clone -b jazzy https://github.com/ament/ament_index src/ament_index; \
4646
colcon build --cmake-args -DBUILD_TESTING=OFF -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=gcc;
4747

4848
$(EXTENSIONS_DIR)/micro_ros_src/src:
4949
@rm -rf micro_ros_src; \
5050
mkdir micro_ros_src; cd micro_ros_src; \
5151
git clone -b ros2 https://github.com/eProsima/micro-CDR src/micro-CDR; \
5252
git clone -b ros2 https://github.com/eProsima/Micro-XRCE-DDS-Client src/Micro-XRCE-DDS-Client; \
53-
git clone -b rolling https://github.com/micro-ROS/rcl src/rcl; \
54-
git clone -b rolling https://github.com/ros2/rclc src/rclc; \
55-
git clone -b rolling https://github.com/micro-ROS/rcutils src/rcutils; \
56-
git clone -b rolling https://github.com/micro-ROS/micro_ros_msgs src/micro_ros_msgs; \
57-
git clone -b rolling https://github.com/micro-ROS/rmw-microxrcedds src/rmw-microxrcedds; \
58-
git clone -b rolling https://github.com/micro-ROS/rosidl_typesupport src/rosidl_typesupport; \
59-
git clone -b rolling https://github.com/micro-ROS/rosidl_typesupport_microxrcedds src/rosidl_typesupport_microxrcedds; \
60-
git clone -b rolling https://github.com/ros2/rosidl src/rosidl; \
61-
git clone -b rolling https://github.com/ros2/rosidl_dynamic_typesupport src/rosidl_dynamic_typesupport; \
62-
git clone -b rolling https://github.com/ros2/rosidl_core src/rosidl_core; \
63-
git clone -b rolling https://github.com/ros2/rmw src/rmw; \
64-
git clone -b rolling https://github.com/ros2/rcl_interfaces src/rcl_interfaces; \
65-
git clone -b rolling https://github.com/ros2/rosidl_defaults src/rosidl_defaults; \
66-
git clone -b rolling https://github.com/ros2/unique_identifier_msgs src/unique_identifier_msgs; \
67-
git clone -b rolling https://github.com/ros2/common_interfaces src/common_interfaces; \
68-
git clone -b rolling https://github.com/ros2/test_interface_files src/test_interface_files; \
69-
git clone -b rolling https://github.com/ros2/rmw_implementation src/rmw_implementation; \
70-
git clone -b rolling https://github.com/ros2/rcl_logging src/rcl_logging; \
71-
git clone -b rolling https://github.com/ros2/ros2_tracing src/ros2_tracing; \
72-
git clone -b rolling https://github.com/micro-ROS/micro_ros_utilities src/micro_ros_utilities; \
53+
git clone -b jazzy https://github.com/micro-ROS/rcl src/rcl; \
54+
git clone -b jazzy https://github.com/ros2/rclc src/rclc; \
55+
git clone -b jazzy https://github.com/micro-ROS/rcutils src/rcutils; \
56+
git clone -b jazzy https://github.com/micro-ROS/micro_ros_msgs src/micro_ros_msgs; \
57+
git clone -b jazzy https://github.com/micro-ROS/rmw-microxrcedds src/rmw-microxrcedds; \
58+
git clone -b jazzy https://github.com/micro-ROS/rosidl_typesupport src/rosidl_typesupport; \
59+
git clone -b jazzy https://github.com/micro-ROS/rosidl_typesupport_microxrcedds src/rosidl_typesupport_microxrcedds; \
60+
git clone -b jazzy https://github.com/ros2/rosidl src/rosidl; \
61+
git clone -b jazzy https://github.com/ros2/rosidl_dynamic_typesupport src/rosidl_dynamic_typesupport; \
62+
git clone -b jazzy https://github.com/ros2/rosidl_core src/rosidl_core; \
63+
git clone -b jazzy https://github.com/ros2/rmw src/rmw; \
64+
git clone -b jazzy https://github.com/ros2/rcl_interfaces src/rcl_interfaces; \
65+
git clone -b jazzy https://github.com/ros2/rosidl_defaults src/rosidl_defaults; \
66+
git clone -b jazzy https://github.com/ros2/unique_identifier_msgs src/unique_identifier_msgs; \
67+
git clone -b jazzy https://github.com/ros2/common_interfaces src/common_interfaces; \
68+
git clone -b jazzy https://github.com/ros2/test_interface_files src/test_interface_files; \
69+
git clone -b jazzy https://github.com/ros2/rmw_implementation src/rmw_implementation; \
70+
git clone -b jazzy https://github.com/ros2/rcl_logging src/rcl_logging; \
71+
git clone -b jazzy https://github.com/ros2/ros2_tracing src/ros2_tracing; \
72+
git clone -b jazzy https://github.com/micro-ROS/micro_ros_utilities src/micro_ros_utilities; \
7373
touch src/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE; \
7474
touch src/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE; \
7575
touch src/ros2_tracing/test_tracetools/COLCON_IGNORE; \

0 commit comments

Comments
 (0)