Skip to content

Commit

Permalink
Bump jazzy (#16)
Browse files Browse the repository at this point in the history 
* Bump jazzy

* Bump ubuntu

* Fix pip

* Bump flags
  • Loading branch information
@pablogs9
pablogs9 authored Jun 3, 2024
1 parent f83776e commit d14d5bd
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

micro_ros_azure_app:
runs-on: ubuntu-latest
container: ubuntu:20.04
container: ubuntu:24.04
strategy:
matrix:
azure_rtos_version: [v6.1.7_rel]
Expand All @@ -27,7 +27,7 @@ jobs:
apt update
export DEBIAN_FRONTEND=noninteractive
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
pip3 install catkin_pkg lark-parser colcon-common-extensions
pip3 install catkin_pkg lark-parser colcon-common-extensions --break-system-packages
- uses: actions/checkout@v2
with:
path: repo
Expand Down
2 changes: 1 addition & 1 deletion cmake/arm-gcc-cortex-m4.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
set(THREADX_ARCH "cortex_m4")
set(THREADX_TOOLCHAIN "gnu")

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

include(${CMAKE_CURRENT_LIST_DIR}/arm-gcc-cortex-toolchain.cmake)
52 changes: 26 additions & 26 deletions microros/libmicroros.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,39 +37,39 @@ $(EXTENSIONS_DIR)/toolchain.cmake: $(EXTENSIONS_DIR)/toolchain.cmake.in
$(EXTENSIONS_DIR)/micro_ros_dev/install:
@rm -rf micro_ros_dev; \
mkdir micro_ros_dev; cd micro_ros_dev; \
git clone -b rolling https://github.com/ament/ament_cmake src/ament_cmake; \
git clone -b rolling https://github.com/ament/ament_lint src/ament_lint; \
git clone -b rolling https://github.com/ament/ament_package src/ament_package; \
git clone -b rolling https://github.com/ament/googletest src/googletest; \
git clone -b rolling https://github.com/ros2/ament_cmake_ros src/ament_cmake_ros; \
git clone -b rolling https://github.com/ament/ament_index src/ament_index; \
git clone -b jazzy https://github.com/ament/ament_cmake src/ament_cmake; \
git clone -b jazzy https://github.com/ament/ament_lint src/ament_lint; \
git clone -b jazzy https://github.com/ament/ament_package src/ament_package; \
git clone -b jazzy https://github.com/ament/googletest src/googletest; \
git clone -b jazzy https://github.com/ros2/ament_cmake_ros src/ament_cmake_ros; \
git clone -b jazzy https://github.com/ament/ament_index src/ament_index; \
colcon build --cmake-args -DBUILD_TESTING=OFF -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=gcc;

$(EXTENSIONS_DIR)/micro_ros_src/src:
@rm -rf micro_ros_src; \
mkdir micro_ros_src; cd micro_ros_src; \
git clone -b ros2 https://github.com/eProsima/micro-CDR src/micro-CDR; \
git clone -b ros2 https://github.com/eProsima/Micro-XRCE-DDS-Client src/Micro-XRCE-DDS-Client; \
git clone -b rolling https://github.com/micro-ROS/rcl src/rcl; \
git clone -b rolling https://github.com/ros2/rclc src/rclc; \
git clone -b rolling https://github.com/micro-ROS/rcutils src/rcutils; \
git clone -b rolling https://github.com/micro-ROS/micro_ros_msgs src/micro_ros_msgs; \
git clone -b rolling https://github.com/micro-ROS/rmw-microxrcedds src/rmw-microxrcedds; \
git clone -b rolling https://github.com/micro-ROS/rosidl_typesupport src/rosidl_typesupport; \
git clone -b rolling https://github.com/micro-ROS/rosidl_typesupport_microxrcedds src/rosidl_typesupport_microxrcedds; \
git clone -b rolling https://github.com/ros2/rosidl src/rosidl; \
git clone -b rolling https://github.com/ros2/rosidl_dynamic_typesupport src/rosidl_dynamic_typesupport; \
git clone -b rolling https://github.com/ros2/rosidl_core src/rosidl_core; \
git clone -b rolling https://github.com/ros2/rmw src/rmw; \
git clone -b rolling https://github.com/ros2/rcl_interfaces src/rcl_interfaces; \
git clone -b rolling https://github.com/ros2/rosidl_defaults src/rosidl_defaults; \
git clone -b rolling https://github.com/ros2/unique_identifier_msgs src/unique_identifier_msgs; \
git clone -b rolling https://github.com/ros2/common_interfaces src/common_interfaces; \
git clone -b rolling https://github.com/ros2/test_interface_files src/test_interface_files; \
git clone -b rolling https://github.com/ros2/rmw_implementation src/rmw_implementation; \
git clone -b rolling https://github.com/ros2/rcl_logging src/rcl_logging; \
git clone -b rolling https://github.com/ros2/ros2_tracing src/ros2_tracing; \
git clone -b rolling https://github.com/micro-ROS/micro_ros_utilities src/micro_ros_utilities; \
git clone -b jazzy https://github.com/micro-ROS/rcl src/rcl; \
git clone -b jazzy https://github.com/ros2/rclc src/rclc; \
git clone -b jazzy https://github.com/micro-ROS/rcutils src/rcutils; \
git clone -b jazzy https://github.com/micro-ROS/micro_ros_msgs src/micro_ros_msgs; \
git clone -b jazzy https://github.com/micro-ROS/rmw-microxrcedds src/rmw-microxrcedds; \
git clone -b jazzy https://github.com/micro-ROS/rosidl_typesupport src/rosidl_typesupport; \
git clone -b jazzy https://github.com/micro-ROS/rosidl_typesupport_microxrcedds src/rosidl_typesupport_microxrcedds; \
git clone -b jazzy https://github.com/ros2/rosidl src/rosidl; \
git clone -b jazzy https://github.com/ros2/rosidl_dynamic_typesupport src/rosidl_dynamic_typesupport; \
git clone -b jazzy https://github.com/ros2/rosidl_core src/rosidl_core; \
git clone -b jazzy https://github.com/ros2/rmw src/rmw; \
git clone -b jazzy https://github.com/ros2/rcl_interfaces src/rcl_interfaces; \
git clone -b jazzy https://github.com/ros2/rosidl_defaults src/rosidl_defaults; \
git clone -b jazzy https://github.com/ros2/unique_identifier_msgs src/unique_identifier_msgs; \
git clone -b jazzy https://github.com/ros2/common_interfaces src/common_interfaces; \
git clone -b jazzy https://github.com/ros2/test_interface_files src/test_interface_files; \
git clone -b jazzy https://github.com/ros2/rmw_implementation src/rmw_implementation; \
git clone -b jazzy https://github.com/ros2/rcl_logging src/rcl_logging; \
git clone -b jazzy https://github.com/ros2/ros2_tracing src/ros2_tracing; \
git clone -b jazzy https://github.com/micro-ROS/micro_ros_utilities src/micro_ros_utilities; \
touch src/rosidl/rosidl_typesupport_introspection_cpp/COLCON_IGNORE; \
touch src/rcl_logging/rcl_logging_spdlog/COLCON_IGNORE; \
touch src/ros2_tracing/test_tracetools/COLCON_IGNORE; \
Expand Down

0 comments on commit d14d5bd

Please sign in to comment.