Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Github Actions #2283

Merged
merged 3 commits into from
Oct 1, 2024
Merged

Update Github Actions #2283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
035ef93
change to humble
petergarud Sep 29, 2024
a252f3c
change dockerfile
petergarud Sep 29, 2024
e8b44a5
remvoe werror switch
petergarud Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
build-and-test:
runs-on: ubuntu-latest
container:
image: robojackets/robocup-software:foxy
image: robojackets/robocup-software:humble
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did we push a humble tag of this image?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i see that we did. it says on docker hub that I did actually, LOL. how did you guys manage that?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup I made a humble tag on Sundays meeting

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You were still signed in on the shop computer so I logged in on your account

defaults:
run:
shell: bash
Expand All @@ -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::"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use phusion/baseimage if problems arise
FROM ros:foxy-ros-base-focal
FROM ros:humble-ros-base-jammy
LABEL maintainer="oswinso@gmail.com"

# Setup apt to be happy with no console input
Expand Down
Loading