From 26d8be019e3cf288117f399d9d64f9a18ae41707 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Mon, 19 Aug 2024 17:52:09 -0700 Subject: [PATCH] Enable ubuntu noble github actions, require 3.22.1 (#634) Signed-off-by: Ian Chen --- .github/workflows/ci.yml | 14 +++++++++++++- CMakeLists.txt | 2 +- README.md | 6 +++--- examples/plugin/custom_context_menu/CMakeLists.txt | 2 +- examples/plugin/dialog_from_plugin/CMakeLists.txt | 2 +- examples/plugin/gz_components/CMakeLists.txt | 2 +- examples/plugin/hello_plugin/CMakeLists.txt | 2 +- examples/plugin/multiple_qml/CMakeLists.txt | 2 +- examples/standalone/custom_drawer/CMakeLists.txt | 2 +- examples/standalone/dialogs/CMakeLists.txt | 2 +- examples/standalone/marker/CMakeLists.txt | 2 +- examples/standalone/point_cloud/CMakeLists.txt | 2 +- examples/standalone/scene_provider/CMakeLists.txt | 2 +- examples/standalone/start_dialog/CMakeLists.txt | 2 +- examples/standalone/window/CMakeLists.txt | 2 +- 15 files changed, 29 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bdac4dc4c..09edd79c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ on: push: branches: - 'ign-gui[0-9]' - - 'gz-gui[0-9]?' + - 'gz-gui[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 a20b96fbb..c7c7f509f 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 diff --git a/README.md b/README.md index 09da13f63..9daa010f1 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,9 @@ Build | Status -- | -- Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-gui/branch/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-gui/branch/main) -Ubuntu Focal | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_gui-ci-main-focal-amd64)](https://build.osrfoundation.org/job/ignition_gui-ci-main-focal-amd64) -Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_gui-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_gui-ci-main-homebrew-amd64) -Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ign_gui-ci-win)](https://build.osrfoundation.org/job/ign_gui-ci-win) +Ubuntu Noble| [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_gui-ci-main-noble-amd64)](https://build.osrfoundation.org/job/gz_gui-ci-main-noble-amd64) +Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_gui-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/gz_gui-ci-main-homebrew-amd64) +Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_gui-main-win)](https://build.osrfoundation.org/job/gz_gui-main-win) Gazebo GUI builds on top of [Qt](https://www.qt.io/) to provide widgets which are useful when developing robotics applications, such as a 3D view, plots, dashboard, etc, diff --git a/examples/plugin/custom_context_menu/CMakeLists.txt b/examples/plugin/custom_context_menu/CMakeLists.txt index 0ad64aa2e..fe24cd0bc 100644 --- a/examples/plugin/custom_context_menu/CMakeLists.txt +++ b/examples/plugin/custom_context_menu/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(gz-gui-custom-context-menu) diff --git a/examples/plugin/dialog_from_plugin/CMakeLists.txt b/examples/plugin/dialog_from_plugin/CMakeLists.txt index 54de73a3d..1b5cdc9a9 100644 --- a/examples/plugin/dialog_from_plugin/CMakeLists.txt +++ b/examples/plugin/dialog_from_plugin/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(gz-gui-dialog-from-plugin) diff --git a/examples/plugin/gz_components/CMakeLists.txt b/examples/plugin/gz_components/CMakeLists.txt index 0ae3f9461..d565c2cf5 100644 --- a/examples/plugin/gz_components/CMakeLists.txt +++ b/examples/plugin/gz_components/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(gz-gui-gz-components) diff --git a/examples/plugin/hello_plugin/CMakeLists.txt b/examples/plugin/hello_plugin/CMakeLists.txt index 940dc5580..1a8716afa 100644 --- a/examples/plugin/hello_plugin/CMakeLists.txt +++ b/examples/plugin/hello_plugin/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(gz-gui-hello-plugin) diff --git a/examples/plugin/multiple_qml/CMakeLists.txt b/examples/plugin/multiple_qml/CMakeLists.txt index 76ca88aea..35506f34f 100644 --- a/examples/plugin/multiple_qml/CMakeLists.txt +++ b/examples/plugin/multiple_qml/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(gz-gui-multiple-qml) diff --git a/examples/standalone/custom_drawer/CMakeLists.txt b/examples/standalone/custom_drawer/CMakeLists.txt index 31d79d8a3..389d7e007 100644 --- a/examples/standalone/custom_drawer/CMakeLists.txt +++ b/examples/standalone/custom_drawer/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(gz-gui-custom-drawer) diff --git a/examples/standalone/dialogs/CMakeLists.txt b/examples/standalone/dialogs/CMakeLists.txt index 49fd17ea4..571cc65e3 100644 --- a/examples/standalone/dialogs/CMakeLists.txt +++ b/examples/standalone/dialogs/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(gz-gui-dialogs) diff --git a/examples/standalone/marker/CMakeLists.txt b/examples/standalone/marker/CMakeLists.txt index 378eb39e0..84b6073a2 100644 --- a/examples/standalone/marker/CMakeLists.txt +++ b/examples/standalone/marker/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(gz-gui-marker) diff --git a/examples/standalone/point_cloud/CMakeLists.txt b/examples/standalone/point_cloud/CMakeLists.txt index c1c38f3d6..894e549f6 100644 --- a/examples/standalone/point_cloud/CMakeLists.txt +++ b/examples/standalone/point_cloud/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(gz-gui-point-cloud-example) diff --git a/examples/standalone/scene_provider/CMakeLists.txt b/examples/standalone/scene_provider/CMakeLists.txt index b48ef4c2d..c9e4f9a11 100644 --- a/examples/standalone/scene_provider/CMakeLists.txt +++ b/examples/standalone/scene_provider/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(gz-gui-scene-provider) diff --git a/examples/standalone/start_dialog/CMakeLists.txt b/examples/standalone/start_dialog/CMakeLists.txt index 18b927982..89cd2ab5f 100644 --- a/examples/standalone/start_dialog/CMakeLists.txt +++ b/examples/standalone/start_dialog/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(gz-gui-start-dialog) diff --git a/examples/standalone/window/CMakeLists.txt b/examples/standalone/window/CMakeLists.txt index 9c062dd87..29990725f 100644 --- a/examples/standalone/window/CMakeLists.txt +++ b/examples/standalone/window/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(gz-gui-window)