From 1a5a55813398d10270073f1e67d343ce487259ba Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Mon, 19 Aug 2024 15:35:43 -0700 Subject: [PATCH] Enable Ubuntu Noble github actions, require cmake 3.22.1 (#457) Signed-off-by: Ian Chen --- .github/workflows/ci.yml | 14 +++++++++++++- CMakeLists.txt | 8 +------- README.md | 6 +++--- examples/custom_sensor/CMakeLists.txt | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c37049d5..46b88caf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ on: push: branches: - 'ign-sensors[0-9]' - - 'gz-sensors[0-9]?' + - 'gz-sensors[1-9]?[0-9]' - 'main' jobs: @@ -23,3 +23,15 @@ jobs: cppcheck-enabled: true cpplint-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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c82c166..6083328d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 @@ -61,12 +61,6 @@ set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR}) #-------------------------------------- # Find gz-rendering - -# See CMP0072 for more details (cmake --help-policy CMP0072) -if ((NOT ${CMAKE_VERSION} VERSION_LESS 3.11) AND (NOT OpenGL_GL_PREFERENCE)) - set(OpenGL_GL_PREFERENCE "GLVND") -endif() - gz_find_package(gz-rendering9 REQUIRED OPTIONAL_COMPONENTS ogre ogre2) set(GZ_RENDERING_VER ${gz-rendering9_VERSION_MAJOR}) diff --git a/README.md b/README.md index 3774985d..b40fc000 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,10 @@ Build | Status -- | -- -Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-sensors/tree/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-sensors/tree/main) -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) +Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-sensors/branch/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-sensors/branch/main) +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) 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) -Windows | [![Build Status](https://build.osrfoundation.org/job/gz_sensors-main-win/badge/icon)](https://build.osrfoundation.org/job/gz_sensors-main-win/) +Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_sensors-main-win)](https://build.osrfoundation.org/job/gz_sensors-main-win/) Gazebo Sensors, a component of [Gazebo](https://gazebosim.org), provides numerous sensor models diff --git a/examples/custom_sensor/CMakeLists.txt b/examples/custom_sensor/CMakeLists.txt index ebb79cdb..d285bd9c 100644 --- a/examples/custom_sensor/CMakeLists.txt +++ b/examples/custom_sensor/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) +cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR) project(odometer)