From 3539a45b6d5b8e48908d3f828f0b9e98235c6c3f Mon Sep 17 00:00:00 2001
From: Joshua Whitley <josh@electrifiedautonomy.com>
Date: Wed, 4 Dec 2024 10:16:08 -0800
Subject: [PATCH] Update workflows and badges

---
 .github/workflows/humble-build-ci.yaml         |  4 ++--
 ...{iron-build-ci.yaml => jazzy-build-ci.yaml} | 18 +++++++++---------
 .github/workflows/rolling-build-ci.yaml        |  8 ++++----
 README.md                                      |  4 +++-
 4 files changed, 18 insertions(+), 16 deletions(-)
 rename .github/workflows/{iron-build-ci.yaml => jazzy-build-ci.yaml} (55%)

diff --git a/.github/workflows/humble-build-ci.yaml b/.github/workflows/humble-build-ci.yaml
index 41d74514..82390fe2 100644
--- a/.github/workflows/humble-build-ci.yaml
+++ b/.github/workflows/humble-build-ci.yaml
@@ -1,4 +1,4 @@
-name: Basic Build Workflow
+name: Humble Build
 
 on:
   - pull_request
@@ -29,7 +29,7 @@ jobs:
           wiimote_msgs
         target-ros2-distro: humble
     - name: Upload logs
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: colcon-logs
         path: ${{ steps.humble_action_ros_ci_step.outputs.ros-workspace-directory-name }}/log
diff --git a/.github/workflows/iron-build-ci.yaml b/.github/workflows/jazzy-build-ci.yaml
similarity index 55%
rename from .github/workflows/iron-build-ci.yaml
rename to .github/workflows/jazzy-build-ci.yaml
index 6e37808c..b98f15d9 100644
--- a/.github/workflows/iron-build-ci.yaml
+++ b/.github/workflows/jazzy-build-ci.yaml
@@ -1,24 +1,24 @@
-name: Basic Build Workflow
+name: Jazzy Build
 
 on:
   - pull_request
   - push
 
 jobs:
-  build-iron:
-    runs-on: ubuntu-22.04
+  build-rolling:
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
     container:
-      image: rostooling/setup-ros-docker:ubuntu-jammy-ros-iron-desktop-latest
+      image: rostooling/setup-ros-docker:ubuntu-noble-ros-jazzy-desktop-latest
     steps:
     - name: Build Environment
       uses: ros-tooling/setup-ros@v0.7
       with:
-        required-ros-distributions: iron
+        required-ros-distributions: jazzy
     - name: Run Tests
       uses: ros-tooling/action-ros-ci@v0.3
-      id: iron_action_ros_ci_step
+      id: jazzy_action_ros_ci_step
       with:
         package-name: |
           joy
@@ -27,10 +27,10 @@ jobs:
           spacenav
           wiimote
           wiimote_msgs
-        target-ros2-distro: iron
+        target-ros2-distro: jazzy
     - name: Upload logs
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: colcon-logs
-        path: ${{ steps.iron_action_ros_ci_step.outputs.ros-workspace-directory-name }}/log
+        path: ${{ steps.jazzy_action_ros_ci_step.outputs.ros-workspace-directory-name }}/log
       if: always()
diff --git a/.github/workflows/rolling-build-ci.yaml b/.github/workflows/rolling-build-ci.yaml
index 081b4084..89b950c3 100644
--- a/.github/workflows/rolling-build-ci.yaml
+++ b/.github/workflows/rolling-build-ci.yaml
@@ -1,4 +1,4 @@
-name: Basic Build Workflow
+name: Rolling Build
 
 on:
   - pull_request
@@ -6,11 +6,11 @@ on:
 
 jobs:
   build-rolling:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
     container:
-      image: rostooling/setup-ros-docker:ubuntu-jammy-ros-rolling-desktop-latest
+      image: rostooling/setup-ros-docker:ubuntu-noble-ros-rolling-desktop-latest
     steps:
     - name: Build Environment
       uses: ros-tooling/setup-ros@v0.7
@@ -29,7 +29,7 @@ jobs:
           wiimote_msgs
         target-ros2-distro: rolling
     - name: Upload logs
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: colcon-logs
         path: ${{ steps.rolling_action_ros_ci_step.outputs.ros-workspace-directory-name }}/log
diff --git a/README.md b/README.md
index 50fdebfd..bd45672d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 # ROS Joystick Drivers Stack #
 
-[![](https://github.com/ros-drivers/joystick_drivers/workflows/Basic%20Build%20Workflow/badge.svg?branch=ros2)](https://github.com/ros-drivers/joystick_drivers/actions)
+[![Humble Build](https://github.com/ros-drivers/joystick_drivers/workflows/Humble%20Build/badge.svg?branch=ros2)](https://github.com/ros-drivers/joystick_drivers/actions)
+[![Jazzy Build](https://github.com/ros-drivers/joystick_drivers/workflows/Jazzy%20Build/badge.svg?branch=ros2)](https://github.com/ros-drivers/joystick_drivers/actions)
+[![Rolling Build](https://github.com/ros-drivers/joystick_drivers/workflows/Rolling%20Build/badge.svg?branch=ros2)](https://github.com/ros-drivers/joystick_drivers/actions)
 
 A simple set of nodes for supporting various types of joystick inputs and producing ROS messages from the underlying OS messages.