Skip to content

Commit 0ba59f6

Browse files
authored
Merge pull request #66 from ROBOTIS-GIT/feature-buildfarm-error-fix
Buildfarm error fix
2 parents b546ed0 + 3436d5f commit 0ba59f6

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

.github/workflows/ros-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
ros_distribution:
2020
- humble
2121
- jazzy
22-
- rolling
22+
# - rolling
2323
include:
2424
# ROS 2 Humble Hawksbill
2525
- docker_image: ubuntu:jammy
@@ -30,9 +30,9 @@ jobs:
3030
ros_distribution: jazzy
3131
ros_version: 2
3232
# ROS 2 Rolling Ridley
33-
- docker_image: ubuntu:noble
34-
ros_distribution: rolling
35-
ros_version: 2
33+
# - docker_image: ubuntu:noble
34+
# ros_distribution: rolling
35+
# ros_version: 2
3636
container:
3737
image: ${{ matrix.docker_image }}
3838
steps:

turtlebot3_panorama/CMakeLists.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,18 @@ if(DEFINED ENV{ROS_DISTRO})
1616
set(ROS_DISTRO $ENV{ROS_DISTRO})
1717
endif()
1818

19+
if(NOT DEFINED ROS_DISTRO OR ROS_DISTRO STREQUAL "")
20+
execute_process(
21+
COMMAND printenv ROS_DISTRO
22+
OUTPUT_VARIABLE ROS_DISTRO
23+
OUTPUT_STRIP_TRAILING_WHITESPACE
24+
)
25+
endif()
26+
27+
if(NOT DEFINED ROS_DISTRO OR ROS_DISTRO STREQUAL "")
28+
message(WARNING "ROS_DISTRO is not defined.")
29+
endif()
30+
1931
if(ROS_DISTRO STREQUAL "humble")
2032
add_definitions(-DROS2_HUMBLE)
2133
elseif(ROS_DISTRO STREQUAL "jazzy" OR ROS_DISTRO STREQUAL "rolling")

0 commit comments

Comments
 (0)