Skip to content

Commit 9e9637f

Browse files
authored
Bump jazzy (#308)
* Bump jazzy * Fix linting
1 parent 6833232 commit 9e9637f

3 files changed

Lines changed: 9 additions & 15 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ on:
66
- humble
77
- iron
88
- rolling
9+
- jazzy
910
pull_request:
1011
branches:
1112
- '**'
1213

1314
jobs:
1415
rmw_microxrcedds_ci:
1516
runs-on: ubuntu-latest
16-
container: microros/micro-ros-agent:rolling
17+
container: microros/micro-ros-agent:jazzy
1718

1819
steps:
1920
- uses: actions/checkout@v3
@@ -25,12 +26,12 @@ jobs:
2526
apt update && apt install -y python3-pip git python3-rosdep python3-colcon-common-extensions curl ros-$ROS_DISTRO-performance-test-fixture
2627
git clone -b ros2 https://github.com/eProsima/Micro-CDR src/Micro-CDR
2728
git clone -b ros2 https://github.com/eProsima/Micro-XRCE-DDS-Client src/Micro-XRCE-DDS-Client
28-
git clone -b rolling https://github.com/micro-ROS/rosidl_typesupport_microxrcedds src/rosidl_typesupport_microxrcedds
29-
git clone -b rolling https://github.com/ros2/rmw src/rmw
29+
git clone -b jazzy https://github.com/micro-ROS/rosidl_typesupport_microxrcedds src/rosidl_typesupport_microxrcedds
30+
git clone -b jazzy https://github.com/ros2/rmw src/rmw
3031
touch src/rosidl_typesupport_microxrcedds/test/COLCON_IGNORE
3132
3233
# Install coverage tools
33-
pip3 install gcovr
34+
apt install -y gcovr
3435
. /opt/ros/$ROS_DISTRO/setup.sh
3536
rosdep init && rosdep update
3637
rosdep install --from-paths src -r
@@ -46,15 +47,6 @@ jobs:
4647
colcon test --event-handlers console_direct+ --packages-select=rmw_microxrcedds --return-code-on-test-failure
4748
./build/rmw_microxrcedds/test/test-sizes 2> memanalisys_out
4849
49-
- name: Static memory
50-
continue-on-error: true
51-
if: github.event_name == 'pull_request'
52-
uses: machine-learning-apps/pr-comment@master
53-
env:
54-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
55-
with:
56-
path: memanalisys_out
57-
5850
- name: Coverage
5951
run: |
6052
cd src/rmw-microxrcedds/

.github/workflows/uncrustify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
run_uncrustify:
99
if: contains(github.event.comment.html_url, '/pull/') && contains(github.event.comment.body, 'Marie Kondo')
1010
runs-on: ubuntu-latest
11-
container: ros:rolling
11+
container: ros:jazzy
1212
steps:
1313
- uses: xt0rted/pull-request-comment-branch@v1
1414
id: comment-branch

rmw_microxrcedds_c/src/rmw_graph.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,10 @@ rmw_ret_t rmw_graph_init(
8383

8484
graph_info->datareader_id = uxr_object_id(context->id_datareader++, UXR_DATAREADER_ID);
8585
const char * graph_topic_name = "ros_to_microros_graph";
86+
8687
graph_info->graph_type_support =
87-
rosidl_typesupport_microxrcedds_c__get_message_type_support_handle__micro_ros_msgs__msg__Graph(); //NOLINT
88+
// NOLINTNEXTLINE
89+
rosidl_typesupport_microxrcedds_c__get_message_type_support_handle__micro_ros_msgs__msg__Graph();
8890

8991
// Create graph topic request
9092
graph_info->topic_id = uxr_object_id(context->id_topic++, UXR_TOPIC_ID);

0 commit comments

Comments
 (0)