From 68d534e1e8b4edd8a42e6ed41a293fc1e3e38405 Mon Sep 17 00:00:00 2001
From: Evan Flynn <evanflynn.msu@gmail.com>
Date: Sun, 5 Nov 2023 13:00:08 -0800
Subject: [PATCH 1/3] Run CI on ros2 branch pushes too

Signed-off-by: Evan Flynn <evanflynn.msu@gmail.com>
---
 .github/workflows/build_test.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index aab764fb..071bec14 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -1,6 +1,9 @@
 name: Build and Test
 
 on:
+  push:
+    branches:
+      - 'ros2'
   pull_request:
     branches:
       - 'ros2/*'

From 041ae377bbb052680da7d3db4c3c346037fdf45f Mon Sep 17 00:00:00 2001
From: Evan Flynn <evanflynn.msu@gmail.com>
Date: Sun, 5 Nov 2023 13:20:33 -0800
Subject: [PATCH 2/3] Ensure ROS_VERSION is set for ROS build farms

Signed-off-by: Evan Flynn <evanflynn.msu@gmail.com>
---
 package.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package.xml b/package.xml
index ff9c6f84..92e58ea0 100644
--- a/package.xml
+++ b/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>

From 02d96f92eb46af5332a0ec9f15234510aaa2c091 Mon Sep 17 00:00:00 2001
From: Evan Flynn <evanflynn.msu@gmail.com>
Date: Sun, 5 Nov 2023 13:20:55 -0800
Subject: [PATCH 3/3] Bump checkout action to latest

Signed-off-by: Evan Flynn <evanflynn.msu@gmail.com>
---
 .github/workflows/build_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 071bec14..ae44d338 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -76,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