Skip to content

Commit 9118437

Browse files
Merge branch 'update-ci-config-for-humble' into 'humble'
Update CI config for Humble See merge request ros-tracing/ros2_tracing!292
2 parents 875503f + 0606766 commit 9118437

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

.gitlab-ci.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ variables:
22
DOCKER_DRIVER: overlay2
33
PACKAGES_LIST: ros2trace tracetools tracetools_launch tracetools_read tracetools_test tracetools_trace test_tracetools
44
BASE_IMAGE_ID: registry.gitlab.com/ros-tracing/ci_base
5-
DISTRO: rolling
5+
DISTRO: humble
66

77
stages:
88
- build
@@ -123,13 +123,12 @@ dco:
123123
image: $BASE_IMAGE_ID:$DISTRO-base
124124
script:
125125
- pip3 install -U dco-check
126-
- dco-check --verbose
126+
- CI_DEFAULT_BRANCH=$DISTRO dco-check --verbose --default-branch $DISTRO
127127

128128
# Trigger docs generation
129129
trigger_gen_docs:
130130
stage: report
131131
only:
132132
refs:
133-
- master
134-
- foxy
133+
- humble
135134
trigger: ros-tracing/ros2_tracing-api

instrumented.repos

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ repositories:
22
ros2/rcl:
33
type: git
44
url: https://github.com/ros2/rcl.git
5-
version: master
5+
version: humble
66
ros2/rclcpp:
77
type: git
88
url: https://github.com/ros2/rclcpp.git
9-
version: master
9+
version: humble
1010
ros2/rmw_cyclonedds:
1111
type: git
1212
url: https://github.com/ros2/rmw_cyclonedds.git
13-
version: master
13+
version: humble
1414
ros2/rmw_fastrtps:
1515
type: git
1616
url: https://github.com/ros2/rmw_fastrtps.git
17-
version: master
17+
version: humble

tracing.repos

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ repositories:
22
ros-tracing/ros2_tracing:
33
type: git
44
url: https://gitlab.com/ros-tracing/ros2_tracing.git
5-
version: master
5+
version: humble
66
tracetools_analysis:
77
type: git
88
url: https://gitlab.com/ros-tracing/tracetools_analysis.git
9-
version: master
9+
version: humble

0 commit comments

Comments
 (0)