Skip to content

Commit 072e7ef

Browse files
authored
Update CI (#299)
* Update CI Signed-off-by: acuadros95 <acuadros1995@gmail.com> * Remove CI workarround Signed-off-by: acuadros95 <acuadros1995@gmail.com> --------- Signed-off-by: acuadros95 <acuadros1995@gmail.com>
1 parent 513f0a2 commit 072e7ef

2 files changed

Lines changed: 7 additions & 12 deletions

File tree

.github/workflows/ci.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,20 @@ name: CI rmw_microxrcedds_c
33
on:
44
push:
55
branches:
6-
- foxy
7-
- main
6+
- humble
7+
- iron
8+
- rolling
89
pull_request:
910
branches:
1011
- '**'
1112

1213
jobs:
1314
rmw_microxrcedds_ci:
14-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-latest
1516
container: microros/micro-ros-agent:rolling
1617

1718
steps:
18-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
1920
with:
2021
path: src/rmw-microxrcedds
2122

@@ -24,16 +25,10 @@ jobs:
2425
apt update && apt install -y python3-pip git python3-rosdep python3-colcon-common-extensions curl ros-$ROS_DISTRO-performance-test-fixture
2526
git clone -b ros2 https://github.com/eProsima/Micro-CDR src/Micro-CDR
2627
git clone -b ros2 https://github.com/eProsima/Micro-XRCE-DDS-Client src/Micro-XRCE-DDS-Client
27-
git clone -b main https://github.com/micro-ROS/rosidl_typesupport_microxrcedds src/rosidl_typesupport_microxrcedds
28+
git clone -b rolling https://github.com/micro-ROS/rosidl_typesupport_microxrcedds src/rosidl_typesupport_microxrcedds
2829
git clone -b rolling https://github.com/ros2/rmw src/rmw
2930
touch src/rosidl_typesupport_microxrcedds/test/COLCON_IGNORE
3031
31-
# Workarround until rolling docker is updated
32-
git clone -b rolling https://github.com/ros2/rosidl src/rosidl
33-
cp -r src/rosidl/rosidl_runtime_c src/rosidl_runtime_c
34-
rm -rf src/rosidl
35-
touch src/rosidl_runtime_c/test/COLCON_IGNORE
36-
3732
# Install coverage tools
3833
pip3 install gcovr
3934
. /opt/ros/$ROS_DISTRO/setup.sh

.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:foxy
11+
container: ros:rolling
1212
steps:
1313
- uses: xt0rted/pull-request-comment-branch@v1
1414
id: comment-branch

0 commit comments

Comments
 (0)