Skip to content

Commit 1a5a558

Browse files
authored
Enable Ubuntu Noble github actions, require cmake 3.22.1 (#457)
Signed-off-by: Ian Chen <[email protected]>
1 parent 897b4d1 commit 1a5a558

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
push:
66
branches:
77
- 'ign-sensors[0-9]'
8-
- 'gz-sensors[0-9]?'
8+
- 'gz-sensors[1-9]?[0-9]'
99
- 'main'
1010

1111
jobs:
@@ -23,3 +23,15 @@ jobs:
2323
cppcheck-enabled: true
2424
cpplint-enabled: true
2525
doxygen-enabled: true
26+
noble-ci:
27+
runs-on: ubuntu-latest
28+
name: Ubuntu Noble CI
29+
steps:
30+
- name: Checkout
31+
uses: actions/checkout@v4
32+
- name: Compile and test
33+
id: ci
34+
uses: gazebo-tooling/action-gz-ci@noble
35+
with:
36+
cppcheck-enabled: true
37+
cpplint-enabled: true

CMakeLists.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
22

33
#============================================================================
44
# Initialize the project
@@ -61,12 +61,6 @@ set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR})
6161

6262
#--------------------------------------
6363
# Find gz-rendering
64-
65-
# See CMP0072 for more details (cmake --help-policy CMP0072)
66-
if ((NOT ${CMAKE_VERSION} VERSION_LESS 3.11) AND (NOT OpenGL_GL_PREFERENCE))
67-
set(OpenGL_GL_PREFERENCE "GLVND")
68-
endif()
69-
7064
gz_find_package(gz-rendering9 REQUIRED OPTIONAL_COMPONENTS ogre ogre2)
7165
set(GZ_RENDERING_VER ${gz-rendering9_VERSION_MAJOR})
7266

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
Build | Status
1111
-- | --
12-
Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-sensors/tree/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-sensors/tree/main)
13-
Ubuntu Jammy | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_sensors-ci-main-jammy-amd64)](https://build.osrfoundation.org/job/gz_sensors-ci-main-jammy-amd64)
12+
Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-sensors/branch/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-sensors/branch/main)
13+
Ubuntu Noble | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_sensors-ci-main-noble-amd64)](https://build.osrfoundation.org/job/gz_sensors-ci-main-noble-amd64)
1414
Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_sensors-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/gz_sensors-ci-main-homebrew-amd64)
15-
Windows | [![Build Status](https://build.osrfoundation.org/job/gz_sensors-main-win/badge/icon)](https://build.osrfoundation.org/job/gz_sensors-main-win/)
15+
Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_sensors-main-win)](https://build.osrfoundation.org/job/gz_sensors-main-win/)
1616

1717
Gazebo Sensors, a component of [Gazebo](https://gazebosim.org),
1818
provides numerous sensor models

examples/custom_sensor/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
22

33
project(odometer)
44

0 commit comments

Comments
 (0)