Skip to content

Commit 7eef34a

Browse files
sanatd33petergarud
andauthored
Update Github Actions (#2283)
* change to humble * change dockerfile * remvoe werror switch --------- Co-authored-by: petergarud <[email protected]>
1 parent 8830a80 commit 7eef34a

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/ci.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
build-and-test:
88
runs-on: ubuntu-latest
99
container:
10-
image: robojackets/robocup-software:foxy
10+
image: robojackets/robocup-software:humble
1111
defaults:
1212
run:
1313
shell: bash
@@ -34,23 +34,23 @@ jobs:
3434
- name: Build
3535
run: |
3636
echo "::add-matcher::ci/clang.json"
37-
source /opt/ros/foxy/setup.bash
37+
source /opt/ros/humble/setup.bash
3838
source install/setup.bash
3939
make all
4040
echo "::remove-matcher owner=clang::"
4141
4242
- name: Test
4343
run: |
4444
echo "::add-matcher::ci/gtest.json"
45-
source /opt/ros/foxy/setup.bash
45+
source /opt/ros/humble/setup.bash
4646
source install/setup.bash
4747
./install/lib/rj_robocup/test-soccer
4848
echo "::remove-matcher owner=gtest::"
4949
5050
- name: Run clang-tidy
5151
run: |
5252
echo "::add-matcher::ci/clang-tidy.json"
53-
source /opt/ros/foxy/setup.bash
53+
source /opt/ros/humble/setup.bash
5454
source install/setup.bash
5555
DIFFBASE=${{ github.base_ref }} make checktidy-lines
5656
echo "::remove-matcher owner=clang-tidy::"
@@ -61,7 +61,7 @@ jobs:
6161
if: startsWith(github.head_ref, 'fix-code-style') == false
6262
runs-on: ubuntu-latest
6363
container:
64-
image: ros:foxy
64+
image: ros:humble
6565
defaults:
6666
run:
6767
shell: bash

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ endif()
7878
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -march=native")
7979
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Og")
8080
set(CMAKE_CXX_FLAGS_DEBUG
81-
"${CMAKE_CXX_FLAGS_DEBUG} -Werror=return-type -Werror=delete-non-virtual-dtor -Werror=switch")
81+
"${CMAKE_CXX_FLAGS_DEBUG} -Werror=return-type -Werror=delete-non-virtual-dtor")
8282

8383
# ======================================================================
8484
# Testing

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Use phusion/baseimage if problems arise
2-
FROM ros:foxy-ros-base-focal
2+
FROM ros:humble-ros-base-jammy
33
LABEL maintainer="[email protected]"
44

55
# Setup apt to be happy with no console input

0 commit comments

Comments
 (0)