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

Jump to bottom

Enable 24.04 CI, require cmake 3.22.1 #1037

Merged
merged 8 commits into from
Aug 14, 2024
Merged

Enable 24.04 CI, require cmake 3.22.1 #1037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ef97e57
Require cmake 3.22.1
scpeters Aug 14, 2024
cefb032
Enable 24.04 CI
scpeters Aug 14, 2024
f4375eb
Fix README CI badges
scpeters Aug 14, 2024
4925c87
Remove logic for outdated cmake version
scpeters Aug 14, 2024
85eae93
test Doxygen on jammy
scpeters Aug 14, 2024
002d504
Add packages-noble.apt for ogre-next, vulkan
scpeters Aug 14, 2024
d425643
use libogre-next-2.3-dev
iche033 Aug 14, 2024
f4ef836
waves.cc: fix msvc warnings
scpeters Aug 14, 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
2 changes: 2 additions & 0 deletions .github/ci/packages-noble.apt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
libogre-next-2.3-dev
libvulkan-dev
14 changes: 12 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
push:
branches:
- 'ign-rendering[0-9]'
- 'gz-rendering[0-9]?'
- 'gz-rendering[1-9]?[0-9]'
- 'main'

jobs:
Expand All @@ -20,6 +20,16 @@ jobs:
uses: gazebo-tooling/action-gz-ci@jammy
with:
codecov-enabled: true
doxygen-enabled: true
noble-ci:
runs-on: ubuntu-latest
name: Ubuntu Noble CI
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Compile and test
id: ci
uses: gazebo-tooling/action-gz-ci@noble
with:
cppcheck-enabled: true
cpplint-enabled: true
doxygen-enabled: true
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)

#============================================================================
# Initialize the project
Expand Down Expand Up @@ -53,7 +53,7 @@ set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR})
#--------------------------------------
# Find OpenGL
# See CMP0072 for more details (cmake --help-policy CMP0072)
if ((NOT ${CMAKE_VERSION} VERSION_LESS 3.11) AND (NOT OpenGL_GL_PREFERENCE))
if (NOT OpenGL_GL_PREFERENCE)
set(OpenGL_GL_PREFERENCE "GLVND")
endif()

Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

Build | Status
-- | --
Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-rendering/tree/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-rendering/tree/main)
Ubuntu Jammy | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_rendering-ci-main-jammy-amd64)](https://build.osrfoundation.org/job/gz_rendering-ci-main-jammy-amd64)
Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-rendering/branch/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-rendering/branch/main)
Ubuntu Noble | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_rendering-ci-main-noble-amd64)](https://build.osrfoundation.org/job/gz_rendering-ci-main-noble-amd64)
Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_rendering-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/gz_rendering-ci-main-homebrew-amd64)
Windows | [![Build Status](https://build.osrfoundation.org/job/gz_rendering-main-win/badge/icon)](https://build.osrfoundation.org/job/gz_rendering-main-win/)
Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_rendering-main-win)](https://build.osrfoundation.org/job/gz_rendering-main-win)

Gazebo Rendering is a C++ library designed to provide an abstraction
for different rendering engines. It offers unified APIs for creating
Expand Down
2 changes: 1 addition & 1 deletion examples/actor_animation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-actor-animation)
find_package(gz-rendering9 REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion examples/boundingbox_camera/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-boundingbox-camera)
find_package(gz-rendering9 REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion examples/camera_tracking/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-camera-tracking)
find_package(gz-rendering9 REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion examples/custom_scene_viewer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-custom-scene-viewer)
find_package(gz-rendering9 REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion examples/custom_shaders/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-custom-shaders)

include_directories(SYSTEM
Expand Down
2 changes: 1 addition & 1 deletion examples/custom_shaders_uniforms/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-custom_shaders_uniforms)

include_directories(SYSTEM
Expand Down
2 changes: 1 addition & 1 deletion examples/depth_camera/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-depth-camera)
find_package(gz-rendering9 REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion examples/global_illumination/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-global_illumination)

find_package(gz-rendering9)
Expand Down
2 changes: 1 addition & 1 deletion examples/heightmap/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-heightmap)
find_package(gz-rendering9 REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion examples/hello_world_plugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)

find_package(gz-rendering9 REQUIRED)
set(GZ_RENDERING_VER ${gz-rendering9_VERSION_MAJOR})
Expand Down
2 changes: 1 addition & 1 deletion examples/lidar_visual/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-lidar_visual)
find_package(gz-rendering9 REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion examples/lux_core_engine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)

set(GZ_PLUGIN_VER 2)
set(GZ_COMMON_VER 5)
Expand Down
2 changes: 1 addition & 1 deletion examples/mesh_viewer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-mesh-viewer)
find_package(gz-rendering9 REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion examples/mouse_picking/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-mouse-picking)
find_package(gz-rendering9 REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion examples/ogre2_demo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-ogre2-demo)

find_package(gz-rendering9)
Expand Down
2 changes: 1 addition & 1 deletion examples/particles_demo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-particles-demo)
find_package(gz-rendering9 REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion examples/projector/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-projector)
find_package(gz-rendering9 REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion examples/render_pass/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-render-pass)

find_package(gz-rendering9)
Expand Down
2 changes: 1 addition & 1 deletion examples/segmentation_camera/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-segmentation-camera)
find_package(gz-rendering9 REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion examples/simple_demo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-simple-demo)

find_package(gz-rendering9)
Expand Down
2 changes: 1 addition & 1 deletion examples/simple_demo_qml/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-simple-demo-qml)

#------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion examples/text_geom/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-text-geom)

find_package(gz-rendering9)
Expand Down
2 changes: 1 addition & 1 deletion examples/thermal_camera/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-thermal-camera)
find_package(gz-rendering9 REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion examples/transform_control/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-transform-control)
find_package(gz-rendering9 REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion examples/view_control/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-view-control)
find_package(gz-rendering9 REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion examples/visualization_demo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-visualization-demo)

find_package(gz-rendering9)
Expand Down
2 changes: 1 addition & 1 deletion examples/waves/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-waves)

include_directories(SYSTEM
Expand Down
2 changes: 1 addition & 1 deletion examples/wide_angle_camera/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
project(gz-rendering-wide-angle-camera)
find_package(gz-rendering9 REQUIRED)

Expand Down
4 changes: 2 additions & 2 deletions test/integration/waves.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,11 @@ TEST_F(WavesTest, Waves)
(*vsParams)["dir0"].InitializeBuffer(2);
(*vsParams)["dir0"].UpdateBuffer(dir0);

float dir1[2] = {-0.7, 0.7};
float dir1[2] = {-0.7f, 0.7f};
(*vsParams)["dir1"].InitializeBuffer(2);
(*vsParams)["dir1"].UpdateBuffer(dir1);

float dir2[2] = {0.7, 0.7};
float dir2[2] = {0.7f, 0.7f};
(*vsParams)["dir2"].InitializeBuffer(2);
(*vsParams)["dir2"].UpdateBuffer(dir2);

Expand Down