Skip to content

Commit b2ba5a8

Browse files
authored
Merge pull request #515 from k-okada/ros-o
[.github/workflows/config.yml: disable installing recommends in apt-get install
2 parents 5d4ecc6 + ed63e70 commit b2ba5a8

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

.github/workflows/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,8 @@ jobs:
234234
apt install -qq -y python3-rosdep2
235235
echo "yaml ${{ matrix.ROS_REPOSITORY_URL }}/local.yaml debian" | tee /etc/ros/rosdep/sources.list.d/1-ros-o-builder.list
236236
rosdep update
237+
# disable installing recommends as ros-o-builder do
238+
echo 'APT::Install-Recommends "false";' | tee /etc/apt/apt.conf.d/99norecommends
237239
238240
- name: Setup catkin-tools
239241
run: |

3rdparty/downward/package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<build_depend condition="$ROS_PYTHON_VERSION == 2">python</build_depend>
1818
<build_depend condition="$ROS_PYTHON_VERSION == 3">python3</build_depend>
1919
<build_depend>flex</build_depend>
20+
<build_depend>libfl-dev</build_depend>
2021
<build_depend>bison</build_depend>
2122
<build_depend>gawk</build_depend>
2223
<build_depend>rostest</build_depend>

nfc_ros/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ catkin_package(
2020
CATKIN_DEPENDS message_runtime
2121
)
2222

23-
if ("$ENV{ROS_DISTRO}" MATCHES "indigo")
23+
if ("$ENV{ROS_DISTRO}" MATCHES "indigo" OR "$ENV{ROS_DISTRO}" MATCHES "kinetic")
2424
message(WARNING "nfc_ros requires python3.6 or newer. For indigo, virtualenv generation is skipped.")
2525
else()
2626
catkin_generate_virtualenv(
@@ -36,7 +36,7 @@ install(FILES requirements.txt
3636
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
3737
)
3838

39-
if(CATKIN_ENABLE_TESTING)
39+
if(CATKIN_ENABLE_TESTING AND ("$ENV{ROS_DISTRO}" MATCHES "indigo" OR "$ENV{ROS_DISTRO}" MATCHES "kinetic"))
4040
find_package(rostest REQUIRED)
4141
add_rostest(test/test_rospy_node.test
4242
DEPENDENCIES ${PROJECT_NAME}_generate_virtualenv

0 commit comments

Comments
 (0)