diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 00ad27b7b6..da5fc3bc1a 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -125,6 +125,7 @@ jobs: # - DISTRO: ubuntu:22.04 # CATKIN_OPTIONS: "--ignore-pkg image_view2" # CMAKE_OPTIONS: "-DCMAKE_CXX_FLAGS=-std=c++11" + - DISTRO: ubuntu:24.04 container: ${{ matrix.DISTRO }} @@ -137,11 +138,17 @@ jobs: set -x echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections apt update -q + ## + # https://github.com/v4hn/ros-deb-builder-action/blob/b7c0ed93fde3a86b5b1027bf8f7145cad6067c90/prepare.sh#L27-L28 + # Canonical dropped the Debian ROS packages from 24.04 for political reasons. Wow. + test "${{ matrix.DISTRO }}" = "ubuntu:24.04" && apt install -y software-properties-common retry && retry -d 50,10,30,300 -t 12 add-apt-repository -y ppa:v-launchpad-jochen-sprickerhof-de/ros + ## apt install -y -q -qq catkin git curl build-essential libboost-all-dev python3-pip python3-venv python3-rosdep2 - apt install -y -q -qq ros-desktop-dev rosbash - apt install -y -q -qq libself-test-dev libpcl-ros-dev - apt install -y -q -qq ros-core-dev ros-robot-dev - pip install vcstool + test "${{ matrix.DISTRO }}" = "ubuntu:22.04" && apt install -y -q -qq ros-desktop-dev rosbash + test "${{ matrix.DISTRO }}" = "ubuntu:22.04" && apt install -y -q -qq libself-test-dev libpcl-ros-dev + test "${{ matrix.DISTRO }}" = "ubuntu:22.04" && apt install -y -q -qq ros-core-dev ros-robot-dev + test "${{ matrix.DISTRO }}" = "ubuntu:22.04" && pip install vcstool + test "${{ matrix.DISTRO }}" != "ubuntu:22.04" && apt install -y -q -qq pipx && pipx install vcstool rosdep update - name: Setup rosinstall_generator @@ -152,23 +159,48 @@ jobs: cd rosinstall_generator python3 ./setup.py install - - name: Setup Dependencies Workspace + - name: Setup 24.04 Dependencies Workspace + if: matrix.DISTRO != 'ubuntu:22.04' run: | set -x # install dependencies - mkdir -p ~/ws_depend/src - cd ~/ws_depend/src - ROS_PACKAGE_PATH=/usr/share rosinstall_generator --rosdistro noetic --from-path $GITHUB_WORKSPACE --deps --exclude RPP --depend-type buildtool build | tee repos - vcs import --shallow < repos - # override to use latest development for 22.04 - rosinstall_generator laser_filters laser_assembler map_server --rosdistro noetic --upstream-development | vcs import --force + mkdir -p ~/ws_depend/src/ros-o + cd ~/ws_depend/src/ros-o + git clone https://github.com/ros-o/rosconsole.git + git clone https://github.com/ros-o/gencpp.git + git clone https://github.com/ros-o/ros_comm.git + git clone https://github.com/ros-o/catkin_virtualenv.git + git clone https://github.com/ros-o/perception_pcl.git + export PATH=/github/home/.local/bin:$PATH # for 24.04, vcs installed with pipx + ROS_PACKAGE_PATH=/usr/share:$(pwd) rosinstall_generator --rosdistro noetic --deps --exclude RPP --repos message_runtime message_generation | vcs import --shallow + ROS_PACKAGE_PATH=/usr/share:$(pwd) rosinstall_generator --rosdistro noetic rosbash | vcs import --shallow + + - name: Setup 22.04 Dependencies Workspace + if: matrix.DISTRO == 'ubuntu:22.04' + run: | + set -x + # install dependencies + mkdir -p ~/ws_depend/src/ros-o + cd ~/ws_depend/src/ros-o rosinstall_generator catkin_virtualenv --rosdistro noetic | vcs import --force - rm -fr jsk_common # Run catkin_run_tests_target only when CATKIN_ENABLE_TESTING is enabled #89 (https://github.com/locusrobotics/catkin_virtualenv/pull/89) curl -s -L -O https://patch-diff.githubusercontent.com/raw/locusrobotics/catkin_virtualenv/pull/89.diff patch -p1 < 89.diff - rosdep install -qq -r -y --from-path . --ignore-src || echo "OK" - cd .. + + - name: Setup Dependencies Workspace + run: | + set -x + # install dependencies + mkdir -p ~/ws_depend/src/3rdparty-src + cd ~/ws_depend/src/3rdparty-src + ROS_PACKAGE_PATH=/usr/share rosinstall_generator --rosdistro noetic --from-path $GITHUB_WORKSPACE $HOME/ws_depend/src/ros-o --deps --deps-only --exclude RPP test_catkin_virtualenv test_catkin_virtualenv_inherited --depend-type buildtool build | tee repos + export PATH=/github/home/.local/bin:$PATH # for 24.04, vcs installed with pipx + vcs import --shallow < repos + # override to use latest development for 22.04 + rosinstall_generator laser_filters laser_assembler map_server --rosdistro noetic --upstream-development | vcs import --force + ROS_PACKAGE_PATH=/usr/share:$HOME/ws_depend/src/ros-o rosinstall_generator --from-path $HOME/ws_depend/src/3rdparty-src --rosdistro noetic --deps --deps-only --exclude RPP test_catkin_virtualenv test_catkin_virtualenv_inherited | vcs import --shallow + cd ~/ws_depend + rosdep install -qq -r -y --from-path src --ignore-src || echo "OK" catkin_make_isolated --cmake-args -DCATKIN_ENABLE_TESTING=OFF - name: Setup Workspace @@ -215,6 +247,11 @@ jobs: set -x apt update && apt install -qq -y ca-certificates echo "deb [trusted=yes] ${{ matrix.ROS_REPOSITORY_URL }}/ ./" | tee /etc/apt/sources.list.d/ros-o-builder.list + ## + # https://github.com/v4hn/ros-deb-builder-action/blob/b7c0ed93fde3a86b5b1027bf8f7145cad6067c90/prepare.sh#L27-L28 + # Canonical dropped the Debian ROS packages from 24.04 for political reasons. Wow. + test "${{ matrix.DISTRO }}" = "ubuntu:24.04" && apt install -y software-properties-common retry && retry -d 50,10,30,300 -t 12 add-apt-repository -y ppa:v-launchpad-jochen-sprickerhof-de/ros + ## apt update apt install -qq -y python3-rosdep2 echo "yaml ${{ matrix.ROS_REPOSITORY_URL }}/local.yaml debian" | tee /etc/ros/rosdep/sources.list.d/1-ros-o-builder.list diff --git a/audio_video_recorder/CHANGELOG.rst b/audio_video_recorder/CHANGELOG.rst index 9f8f3acb43..16dd9de75d 100644 --- a/audio_video_recorder/CHANGELOG.rst +++ b/audio_video_recorder/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package audio_video_recorder ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.16 (2025-01-06) +------------------- + 2.2.15 (2024-12-13) ------------------- diff --git a/audio_video_recorder/package.xml b/audio_video_recorder/package.xml index 766eb6916e..c425078e53 100644 --- a/audio_video_recorder/package.xml +++ b/audio_video_recorder/package.xml @@ -1,7 +1,7 @@ audio_video_recorder - 2.2.15 + 2.2.16 ROS package for recording image and audio synchronously Shingo Kitagawa diff --git a/jsk_common/CHANGELOG.rst b/jsk_common/CHANGELOG.rst index 24cb55cea5..724f7d8a74 100644 --- a/jsk_common/CHANGELOG.rst +++ b/jsk_common/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package jsk_common ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.16 (2025-01-06) +------------------- + 2.2.15 (2024-12-13) ------------------- diff --git a/jsk_common/package.xml b/jsk_common/package.xml index 66e4e2866b..f2372015bc 100644 --- a/jsk_common/package.xml +++ b/jsk_common/package.xml @@ -1,7 +1,7 @@ jsk_common - 2.2.15 + 2.2.16

Metapackage that contains commonly used toolset for jsk-ros-pkg

 diff --git a/jsk_coordination_system/dynamic_tf_publisher/CHANGELOG.rst b/jsk_coordination_system/dynamic_tf_publisher/CHANGELOG.rst index d2124bfbc0..2f1b817d0b 100644 --- a/jsk_coordination_system/dynamic_tf_publisher/CHANGELOG.rst +++ b/jsk_coordination_system/dynamic_tf_publisher/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package dynamic_tf_publisher ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.16 (2025-01-06) +------------------- + 2.2.15 (2024-12-13) ------------------- diff --git a/jsk_coordination_system/dynamic_tf_publisher/package.xml b/jsk_coordination_system/dynamic_tf_publisher/package.xml index 01e8e050ca..effeb1ab1e 100644 --- a/jsk_coordination_system/dynamic_tf_publisher/package.xml +++ b/jsk_coordination_system/dynamic_tf_publisher/package.xml @@ -3,7 +3,7 @@ dynamically set the tf trensformation - 2.2.15 + 2.2.16 Manabu Saito Ryohei Ueda BSD diff --git a/jsk_data/CHANGELOG.rst b/jsk_data/CHANGELOG.rst index 875681145a..e86d379464 100644 --- a/jsk_data/CHANGELOG.rst +++ b/jsk_data/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package jsk_data ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.16 (2025-01-06) +------------------- + 2.2.15 (2024-12-13) ------------------- * [jsk_data] Automatically add the host key and Check stdout.read() type (`#1810 `_) diff --git a/jsk_data/package.xml b/jsk_data/package.xml index ea3b3e8796..84424e058d 100644 --- a/jsk_data/package.xml +++ b/jsk_data/package.xml @@ -1,7 +1,7 @@ jsk_data - 2.2.15 + 2.2.16 The jsk_data package Ryohei Ueda diff --git a/jsk_network_tools/CHANGELOG.rst b/jsk_network_tools/CHANGELOG.rst index d9896b4b50..6d21fcbc1b 100644 --- a/jsk_network_tools/CHANGELOG.rst +++ b/jsk_network_tools/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package jsk_network_tools ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.16 (2025-01-06) +------------------- + 2.2.15 (2024-12-13) ------------------- diff --git a/jsk_network_tools/package.xml b/jsk_network_tools/package.xml index c736a0f410..86ee030ff2 100644 --- a/jsk_network_tools/package.xml +++ b/jsk_network_tools/package.xml @@ -1,7 +1,7 @@ jsk_network_tools - 2.2.15 + 2.2.16 jsk_network_tools Ryohei Ueda diff --git a/jsk_ros_patch/image_view2/CHANGELOG.rst b/jsk_ros_patch/image_view2/CHANGELOG.rst index d95405449a..601f843ab6 100644 --- a/jsk_ros_patch/image_view2/CHANGELOG.rst +++ b/jsk_ros_patch/image_view2/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package image_view2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.16 (2025-01-06) +------------------- + 2.2.15 (2024-12-13) ------------------- diff --git a/jsk_ros_patch/image_view2/package.xml b/jsk_ros_patch/image_view2/package.xml index e6371afdb5..aaca131f06 100644 --- a/jsk_ros_patch/image_view2/package.xml +++ b/jsk_ros_patch/image_view2/package.xml @@ -1,6 +1,6 @@ image_view2 - 2.2.15 + 2.2.16 A simple viewer for ROS image topics with draw-on features Kei Okada diff --git a/jsk_ros_patch/multi_map_server/CHANGELOG.rst b/jsk_ros_patch/multi_map_server/CHANGELOG.rst index 05cd59f708..ceff78f71c 100644 --- a/jsk_ros_patch/multi_map_server/CHANGELOG.rst +++ b/jsk_ros_patch/multi_map_server/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package multi_map_server ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.16 (2025-01-06) +------------------- + 2.2.15 (2024-12-13) ------------------- diff --git a/jsk_ros_patch/multi_map_server/package.xml b/jsk_ros_patch/multi_map_server/package.xml index 7972cffedd..3755d742e1 100644 --- a/jsk_ros_patch/multi_map_server/package.xml +++ b/jsk_ros_patch/multi_map_server/package.xml @@ -1,6 +1,6 @@ multi_map_server - 2.2.15 + 2.2.16 multi_map_server provides the Kei Okada diff --git a/jsk_rosbag_tools/CHANGELOG.rst b/jsk_rosbag_tools/CHANGELOG.rst index cd34b64211..68674c5c20 100644 --- a/jsk_rosbag_tools/CHANGELOG.rst +++ b/jsk_rosbag_tools/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog for package jsk_rosbag_tools ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.16 (2025-01-06) +------------------- +* [ROS-O] fix for ROS-O (`#1802 `_) + + * jsk_rosbag_tools: use requirements.in.python3.12 for python3.12 (ubuntu 24.04) + * jsk_rosbag_tools/CMakeLists.txt: $ENV{ROS_DISTRO} -. "$ENV{ROS_DISTRO}" for 24.04, which does not have ROS_DISTRO environment + +* Contributors: Kei Okada + 2.2.15 (2024-12-13) ------------------- diff --git a/jsk_rosbag_tools/CMakeLists.txt b/jsk_rosbag_tools/CMakeLists.txt index b52a9bb298..1b34a43921 100644 --- a/jsk_rosbag_tools/CMakeLists.txt +++ b/jsk_rosbag_tools/CMakeLists.txt @@ -18,17 +18,25 @@ catkin_package( CATKIN_DEPENDS ) -if($ENV{ROS_DISTRO} STREQUAL "indigo" OR $ENV{ROS_DISTRO} STREQUAL "kinetic" OR $ENV{ROS_DISTRO} STREQUAL "melodic") +if("$ENV{ROS_DISTRO}" STREQUAL "indigo" OR "$ENV{ROS_DISTRO}" STREQUAL "kinetic" OR "$ENV{ROS_DISTRO}" STREQUAL "melodic") catkin_generate_virtualenv( INPUT_REQUIREMENTS requirements.in.python2 PYTHON_INTERPRETER python2 ) +else() +find_package(Python COMPONENTS Interpreter) +if(Python_VERSION VERSION_GREATER_EQUAL 3.12.0) + catkin_generate_virtualenv( + INPUT_REQUIREMENTS requirements.in.python3.12 + PYTHON_INTERPRETER python3 + ) else() catkin_generate_virtualenv( INPUT_REQUIREMENTS requirements.in PYTHON_INTERPRETER python3 ) endif() +endif() file(GLOB SCRIPTS_FILES scripts/*) catkin_install_python( diff --git a/jsk_rosbag_tools/package.xml b/jsk_rosbag_tools/package.xml index 7c1ec75fd6..5990258231 100644 --- a/jsk_rosbag_tools/package.xml +++ b/jsk_rosbag_tools/package.xml @@ -1,7 +1,7 @@ jsk_rosbag_tools - 2.2.15 + 2.2.16 The rosbag tools BSD diff --git a/jsk_rosbag_tools/requirements.in.python3.12 b/jsk_rosbag_tools/requirements.in.python3.12 new file mode 100644 index 0000000000..d4b1ec3842 --- /dev/null +++ b/jsk_rosbag_tools/requirements.in.python3.12 @@ -0,0 +1,4 @@ +Pillow==8.4.0 +moviepy==1.0.3 +scipy==1.11.4 +numpy<1.28.0,>=1.21.6 diff --git a/jsk_tilt_laser/CHANGELOG.rst b/jsk_tilt_laser/CHANGELOG.rst index 06d62cf013..cceca49e36 100644 --- a/jsk_tilt_laser/CHANGELOG.rst +++ b/jsk_tilt_laser/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package jsk_tilt_laser ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.16 (2025-01-06) +------------------- + 2.2.15 (2024-12-13) ------------------- diff --git a/jsk_tilt_laser/package.xml b/jsk_tilt_laser/package.xml index 76af3d6dd1..3a00223436 100644 --- a/jsk_tilt_laser/package.xml +++ b/jsk_tilt_laser/package.xml @@ -1,7 +1,7 @@ jsk_tilt_laser - 2.2.15 + 2.2.16 The jsk_tilt_laser package YoheiKakiuchi diff --git a/jsk_tools/CHANGELOG.rst b/jsk_tools/CHANGELOG.rst index e9cf13dfd4..67c11d5f43 100644 --- a/jsk_tools/CHANGELOG.rst +++ b/jsk_tools/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package jsk_tools ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.16 (2025-01-06) +------------------- + 2.2.15 (2024-12-13) ------------------- diff --git a/jsk_tools/package.xml b/jsk_tools/package.xml index 6cd563927c..7c3ff6f3b8 100644 --- a/jsk_tools/package.xml +++ b/jsk_tools/package.xml @@ -1,6 +1,6 @@ jsk_tools - 2.2.15 + 2.2.16 Includes emacs scripts, ros tool alias generator, and launch doc generator. Ryohei Ueda diff --git a/jsk_topic_tools/CHANGELOG.rst b/jsk_topic_tools/CHANGELOG.rst index b42a11da1c..792902e9db 100644 --- a/jsk_topic_tools/CHANGELOG.rst +++ b/jsk_topic_tools/CHANGELOG.rst @@ -2,6 +2,20 @@ Changelog for package jsk_topic_tools ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.16 (2025-01-06) +------------------- +* remove inline from ConnectionBaseNodelet::isSubscribed() (`#1812 `_) + + * jsk_peceptino could not find isSubscribed if it is defined as inline + ``` + usr/lib/x86_64-linux-gnu/libopencv_phase_unwrapping.so.4.5.4d /usr/lib/x86_64-linux-gnu/libopencv_optflow.so.4.5.4d /usr/lib/x86_64-linux-gnu/libopencv_ximgproc.so.4.5.4d /usr/lib/x86_64-linux-gnu/libopencv_video.so.4.5.4d /usr/lib/x86_64-linux-gnu/libopencv_videoio.so.4.5.4d /usr/lib/x86_64-linux-gnu/libopencv_imgcodecs.so.4.5.4d /usr/lib/x86_64-linux-gnu/libopencv_objdetect.so.4.5.4d /usr/lib/x86_64-linux-gnu/libopencv_calib3d.so.4.5.4d /usr/lib/x86_64-linux-gnu/libopencv_dnn.so.4.5.4d /usr/lib/x86_64-linux-gnu/libopencv_features2d.so.4.5.4d /usr/lib/x86_64-linux-gnu/libopencv_flann.so.4.5.4d /usr/lib/x86_64-linux-gnu/libopencv_photo.so.4.5.4d /usr/lib/x86_64-linux-gnu/libopencv_imgproc.so.4.5.4d /usr/lib/x86_64-linux-gnu/libopencv_core.so.4.5.4d + 2025-01-05T05:23:12.3723125Z /usr/bin/ld: /tmp/ccUI43It.ltrans0.ltrans.o:(.data.rel.ro+0xc08): undefined reference to jsk_topic_tools::ConnectionBasedNodelet::isSubscribed()' + 2025-01-05T05:23:12.3918628Z /usr/bin/ld: /tmp/ccUI43It.ltrans7.ltrans.o:(.data.rel.ro+0x578): undefined reference to jsk_topic_tools::ConnectionBasedNodelet::isSubscribed()' + 2025-01-05T05:23:12.4099509Z /usr/bin/ld: /tmp/ccUI43It.ltrans14.ltrans.o:(.data.rel.ro+0x178): undefined reference to jsk_topic_tools::ConnectionBasedNodelet::isSubscribed()' follow + ``` + +* Contributors: Kei Okada + 2.2.15 (2024-12-13) ------------------- diff --git a/jsk_topic_tools/package.xml b/jsk_topic_tools/package.xml index 53b0287242..72f8b2cd7d 100644 --- a/jsk_topic_tools/package.xml +++ b/jsk_topic_tools/package.xml @@ -1,6 +1,6 @@ jsk_topic_tools - 2.2.15 + 2.2.16 jsk_topic_tools Kei Okada Ryohei Ueda diff --git a/jsk_topic_tools/src/connection_based_nodelet.cpp b/jsk_topic_tools/src/connection_based_nodelet.cpp index 29bcf13951..86d879303d 100644 --- a/jsk_topic_tools/src/connection_based_nodelet.cpp +++ b/jsk_topic_tools/src/connection_based_nodelet.cpp @@ -88,7 +88,7 @@ namespace jsk_topic_tools } } - inline bool ConnectionBasedNodelet::isSubscribed() + bool ConnectionBasedNodelet::isSubscribed() { return connection_status_ == SUBSCRIBED; } diff --git a/virtual_force_publisher/CHANGELOG.rst b/virtual_force_publisher/CHANGELOG.rst index 2f88439328..0e5b43d278 100644 --- a/virtual_force_publisher/CHANGELOG.rst +++ b/virtual_force_publisher/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package virtual_force_publisher ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.16 (2025-01-06) +------------------- + 2.2.15 (2024-12-13) ------------------- diff --git a/virtual_force_publisher/package.xml b/virtual_force_publisher/package.xml index 809b031f7c..0fcbe8e1e3 100644 --- a/virtual_force_publisher/package.xml +++ b/virtual_force_publisher/package.xml @@ -1,6 +1,6 @@ virtual_force_publisher - 2.2.15 + 2.2.16 publish end effector's force, which is estmated from joint torque value