From f9ed2919698ba01b6c9ce42d127f7519484e15b0 Mon Sep 17 00:00:00 2001
From: Yadu <yadunund@intrinsic.ai>
Date: Fri, 24 May 2024 14:32:07 -0700
Subject: [PATCH] Run CI with Jazzy (#167)

* Update tpm job to build against jazzy

Signed-off-by: Yadunund <yadunund@gmail.com>

* Add jazzy to usual build and style workflows

Signed-off-by: Yadunund <yadunund@intrinsic.ai>

---------

Signed-off-by: Yadunund <yadunund@gmail.com>
Signed-off-by: Yadunund <yadunund@intrinsic.ai>
---
 .github/workflows/build.yaml           |  4 +--
 .github/workflows/style.yaml           |  4 +--
 .github/workflows/tmp_build_noble.yaml | 36 --------------------------
 3 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 .github/workflows/tmp_build_noble.yaml

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 98c6020d..ec6e3f24 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -13,9 +13,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        docker_image: ['ros:iron-ros-base', 'ros:rolling-ros-base']
+        distro: ['iron', 'jazzy', 'rolling']
     container:
-      image: ${{ matrix.docker_image }}
+      image: ros:${{ matrix.distro }}-ros-base
     timeout-minutes: 30
     steps:
     - name: Deps
diff --git a/.github/workflows/style.yaml b/.github/workflows/style.yaml
index 04f818b1..ff88958f 100644
--- a/.github/workflows/style.yaml
+++ b/.github/workflows/style.yaml
@@ -12,9 +12,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        docker_image: ['ros:iron-ros-base', 'ros:rolling-ros-base']
+        distro: ['iron', 'jazzy', 'rolling']
     container:
-      image: ${{ matrix.docker_image }}
+      image: ros:${{ matrix.distro }}-ros-base
     timeout-minutes: 30
     steps:
     - uses: actions/checkout@v2
diff --git a/.github/workflows/tmp_build_noble.yaml b/.github/workflows/tmp_build_noble.yaml
deleted file mode 100644
index 17d9fe2e..00000000
--- a/.github/workflows/tmp_build_noble.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: build_noble
-on:
-  pull_request:
-  push:
-    branches: [ rolling ]
-  workflow_dispatch:
-defaults:
-  run:
-    shell: bash
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        docker_image: ['ubuntu:noble-20240225']
-    container:
-      image: ${{ matrix.docker_image }}
-    timeout-minutes: 30
-    steps:
-    - name: Setup rolling
-      run: |
-        apt update && apt install curl -y
-        curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg
-        echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" | tee /etc/apt/sources.list.d/ros2.list > /dev/null
-        apt update && apt install ros-dev-tools -y
-        apt install ros-rolling-ros-base -y
-    - uses: actions/checkout@v2
-    - name: rosdep
-      run: |
-        rosdep init
-        rosdep update
-        rosdep install --from-paths . --rosdistro rolling -yir
-    - name: build
-      run: |
-        source /opt/ros/rolling/setup.bash
-        colcon build