From 76c20acf7225a5719801b4faf9cb5df6c6d9f7bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C5=82a=C5=BCej=20Sowa?= <bsowa123@gmail.com>
Date: Mon, 18 Nov 2024 19:15:20 +0100
Subject: [PATCH] Use single branch for jazzy and rolling

---
 .github/workflows/{ci-rolling.yml => ci.yml} | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
 rename .github/workflows/{ci-rolling.yml => ci.yml} (60%)

diff --git a/.github/workflows/ci-rolling.yml b/.github/workflows/ci.yml
similarity index 60%
rename from .github/workflows/ci-rolling.yml
rename to .github/workflows/ci.yml
index 0055c5c..72d70ab 100644
--- a/.github/workflows/ci-rolling.yml
+++ b/.github/workflows/ci.yml
@@ -1,31 +1,31 @@
-name: CI-Rolling
+name: CI
 
 on:
   workflow_dispatch:
   push:
     branches:
-      - rolling
+      - ros2
   pull_request:
     branches:
-      - rolling
-
-env:
- ROS_DISTRO: rolling
+      - ros2
 
 jobs:
   industrial_ci:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
+      fail-fast: false
       matrix:
+        ROS_DISTRO: [jazzy, rolling]
         ROS_REPO: [testing, main]
     env:
+      ROS_DISTRO: ${{ matrix.ROS_DISTRO }}
       ROS_REPO: ${{ matrix.ROS_REPO }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
       - name: Source tests
         uses: "ros-industrial/industrial_ci@master"
         env:
-          UPSTREAM_WORKSPACE: "github:LeoRover/leo_common-ros2#rolling"
+          UPSTREAM_WORKSPACE: "github:LeoRover/leo_common-ros2#${{ matrix.ROS_DISTRO }}"
           PYLINT_CHECK: true
           PYLINT_ARGS: "--rcfile=src/leo_robot-ros2/.pylintrc"