Updated CI (ROS2 jazzy)

introlab · May 26, 2024 · 8dd61c3 · 8dd61c3
1 parent a3b2bcb
commit 8dd61c3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/ros1.yml b/.github/workflows/ros1.yml
@@ -34,6 +34,7 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get -y install ros-${{ matrix.ros_distro }}-cv-bridge qtbase5-dev
+        sudo pip3 uninstall empy --yes
         
     - name: Setup catkin workspace
       run: | 
@@ -42,6 +43,7 @@ jobs:
         cd ${{github.workspace}}/catkin_ws/src
         catkin_init_workspace
         cd ..
+        catkin config --init --cmake-args -DSETUPTOOLS_DEB_LAYOUT=OFF -DCMAKE_C_FLAGS="-Wformat -Werror=format-security" -DCMAKE_CXX_FLAGS="-Wformat -Werror=format-security"
         catkin_make
         
     - uses: actions/checkout@v2

diff --git a/.github/workflows/ros2.yml b/.github/workflows/ros2.yml
@@ -21,17 +21,17 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        ros_distro: [foxy, humble, rolling]
+        ros_distro: [humble, jazzy, rolling]
         include:
-        - ros_distro: 'foxy'
-          os: ubuntu-20.04
         - ros_distro: 'humble'
           os: ubuntu-22.04
+        - ros_distro: 'jazzy'
+          os: ubuntu-24.04
         - ros_distro: 'rolling'
-          os: ubuntu-22.04
+          os: ubuntu-24.04
 
     steps:   
-    - uses: ros-tooling/setup-ros@v0.4
+    - uses: ros-tooling/setup-ros@v0.6
       with:
         required-ros-distributions: ${{ matrix.ros_distro }}