Merge pull request #295 from ros-drivers/run-ci-on-ros2-branch-too

Run CI on ros2 branch pushes too

.github/workflows/build_test.yml

@@ -1,6 +1,9 @@
 name: Build and Test
 
 on:
+  push:
+    branches:
+      - 'ros2'
   pull_request:
     branches:
       - 'ros2/*'
@@ -73,7 +76,7 @@ jobs:
       - name: Setup Directories
         run: mkdir -p ros_ws/src
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: ros_ws/src
       - name: Build and Test ROS 1

package.xml

@@ -13,6 +13,9 @@
   <url type="bugtracker">https://github.com/ros-drivers/usb_cam/issues</url>
   <url type="repository">https://github.com/ros-drivers/usb_cam</url>
 
+  <!-- Required so ROS build farms properly set ROS_VERSION -->
+  <build_depend>ros_environment</build_depend>
+
   <buildtool_depend condition="$ROS_VERSION == 1">catkin</buildtool_depend>
 
   <buildtool_depend condition="$ROS_VERSION == 2">ament_cmake_auto</buildtool_depend>