From ef0483f514e8f7b2bee2f156adc4c130d942af8e Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Tue, 30 Jul 2024 07:32:01 -0700 Subject: [PATCH] Enable 24.04 CI, require cmake 3.22.1 (#619) Part of gazebosim/gz-cmake#350. Signed-off-by: Steve Peters --- .github/workflows/ci.yml | 11 ++++++++++- CMakeLists.txt | 2 +- examples/CMakeLists.txt | 2 +- tutorials/profiler.md | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c6175165..ab362be4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,9 +14,18 @@ jobs: name: Ubuntu Jammy CI steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Compile and test id: ci uses: gazebo-tooling/action-gz-ci@jammy with: codecov-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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 67db83b5..c6512dc7 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/examples/CMakeLists.txt b/examples/CMakeLists.txt index ab609f92..04418a8f 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5 FATAL_ERROR) +cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR) project(gz-common-examples) diff --git a/tutorials/profiler.md b/tutorials/profiler.md index 94cfe110..94fd37df 100644 --- a/tutorials/profiler.md +++ b/tutorials/profiler.md @@ -57,7 +57,7 @@ Update your CMakeLists.txt to the following. Note that the profiler must be enabled at compile time in order to function. ```{.cpp} -cmake_minimum_required(VERSION 2.8 FATAL_ERROR) +cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR) # Find the gz-common library find_package(gz-common6 QUIET REQUIRED COMPONENTS profiler)