Update Github Actions (#2283)

* change to humble * change dockerfile * remvoe werror switch --------- Co-authored-by: petergarud <[email protected]>
RoboJackets · Oct 6, 2024 · 015e19d · 015e19d
1 parent aea314c
commit 015e19d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
   build-and-test:
     runs-on: ubuntu-latest
     container:
-      image: robojackets/robocup-software:foxy
+      image: robojackets/robocup-software:humble
     defaults:
       run:
         shell: bash
@@ -34,23 +34,23 @@ jobs:
       - name: Build
         run: |
           echo "::add-matcher::ci/clang.json"
-          source /opt/ros/foxy/setup.bash
+          source /opt/ros/humble/setup.bash
           source install/setup.bash
           make all
           echo "::remove-matcher owner=clang::"
 
       - name: Test
         run: |
           echo "::add-matcher::ci/gtest.json"
-          source /opt/ros/foxy/setup.bash
+          source /opt/ros/humble/setup.bash
           source install/setup.bash
           ./install/lib/rj_robocup/test-soccer
           echo "::remove-matcher owner=gtest::"
 
       - name: Run clang-tidy
         run: |
           echo "::add-matcher::ci/clang-tidy.json"
-          source /opt/ros/foxy/setup.bash
+          source /opt/ros/humble/setup.bash
           source install/setup.bash
           DIFFBASE=${{ github.base_ref }} make checktidy-lines
           echo "::remove-matcher owner=clang-tidy::"
@@ -61,7 +61,7 @@ jobs:
     if: startsWith(github.head_ref, 'fix-code-style') == false
     runs-on: ubuntu-latest
     container:
-      image: ros:foxy
+      image: ros:humble
     defaults:
       run:
         shell: bash

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -78,7 +78,7 @@ endif()
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -march=native")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Og")
 set(CMAKE_CXX_FLAGS_DEBUG
-    "${CMAKE_CXX_FLAGS_DEBUG} -Werror=return-type -Werror=delete-non-virtual-dtor -Werror=switch")
+    "${CMAKE_CXX_FLAGS_DEBUG} -Werror=return-type -Werror=delete-non-virtual-dtor")
 
 # ======================================================================
 # Testing

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Use phusion/baseimage if problems arise
-FROM ros:foxy-ros-base-focal
+FROM ros:humble-ros-base-jammy
 LABEL maintainer="[email protected]"
 
 # Setup apt to be happy with no console input