ROS_DISTRO: Ubuntu uses 'Debian' and ROS-O uses 'debian'

.github/workflows/config.yml

@@ -200,6 +200,7 @@ jobs:
       matrix:
         include:
           - DISTRO: ubuntu:22.04
+            ROS_REPOSITORY_URL: https://raw.githubusercontent.com/v4hn/ros-o-builder/jammy-one/repository
 
     container: ${{ matrix.DISTRO }}
 
@@ -214,10 +215,10 @@ jobs:
         run: |
           set -x
           apt update && apt install -qq -y ca-certificates
-          echo "deb [trusted=yes] https://raw.githubusercontent.com/v4hn/ros-o-builder/jammy-one/repository/ ./" | tee /etc/apt/sources.list.d/v4hn_ros-o-builder-jammy-one.list
+          echo "deb [trusted=yes] ${{ matrix.ROS_REPOSITORY_URL }}/ ./" | tee /etc/apt/sources.list.d/ros-o-builder.list
           apt update
           apt install -qq -y python3-rosdep2
-          echo "yaml https://raw.githubusercontent.com/v4hn/ros-o-builder/jammy-one/repository/local.yaml debian" | tee /etc/ros/rosdep/sources.list.d/1-v4hn_ros-o-builder-jammy-one.list
+          echo "yaml ${{ matrix.ROS_REPOSITORY_URL }}/local.yaml debian" | tee /etc/ros/rosdep/sources.list.d/1-ros-o-builder.list
           rosdep update
 
       - name: Setup catkin-tools
@@ -245,5 +246,5 @@ jobs:
           source /opt/ros/one/setup.bash
           set -x
           cd ~/ws/
-          catkin build -svi ${{ matrix.CATKIN_OPTIONS }} --cmake-args -DCATKIN_ENABLE_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON ${{ matrix.CMAKE_OPTIONS }}
+          catkin build -sv ${{ matrix.CATKIN_OPTIONS }} --cmake-args -DCATKIN_ENABLE_TESTING=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON ${{ matrix.CMAKE_OPTIONS }}
         shell: bash

jsk_rosbag_tools/CMakeLists.txt

@@ -18,7 +18,7 @@ catkin_package(
   CATKIN_DEPENDS
 )
 
-if($ENV{ROS_DISTRO} STREQUAL "noetic")
+if("$ENV{ROS_DISTRO}" STRGREATER "noetic" OR "$ENV{ROS_DISTRO}" STREQUAL "Debian" OR "$ENV{ROS_DISTRO}" STREQUAL "debian")
   catkin_generate_virtualenv(
     INPUT_REQUIREMENTS requirements.in
     PYTHON_INTERPRETER python3