Bumps in ionic: use gz-cmake4, gz-utils3 (#562)

* Remove focal CI Signed-off-by: Addisu Z. Taddese <[email protected]>
gazebosim · Oct 13, 2023 · beac11e · beac11e
1 parent b7d2a60
commit beac11e
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 30 deletions.
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
@@ -1,6 +1,6 @@
 libeigen3-dev
-libgz-cmake3-dev
-libgz-utils2-dev
+libgz-cmake4-dev
+libgz-utils3-dev
 libpython3-dev
 python3-distutils
 python3-pybind11

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,26 +3,17 @@ name: Ubuntu CI
 on: [push, pull_request]
 
 jobs:
-  focal-ci:
+  jammy-ci:
     runs-on: ubuntu-latest
-    name: Ubuntu Focal CI
+    name: Ubuntu Jammy CI
     steps:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Compile and test
         id: ci
-        uses: gazebo-tooling/action-gz-ci@focal
+        uses: gazebo-tooling/action-gz-ci@jammy
         with:
           codecov-enabled: true
           cppcheck-enabled: true
           cpplint-enabled: true
           doxygen-enabled: true
-  jammy-ci:
-    runs-on: ubuntu-latest
-    name: Ubuntu Jammy CI
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Compile and test
-        id: ci
-        uses: gazebo-tooling/action-gz-ci@jammy
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,8 +9,8 @@ project(gz-math8 VERSION 8.0.0)
 # Find gz-cmake
 #============================================================================
 # If you get an error at this line, you need to install gz-cmake
-find_package(gz-cmake3 REQUIRED)
-set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR})
+find_package(gz-cmake4 REQUIRED)
+set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR})
 
 #============================================================================
 # Configure the project
@@ -56,8 +56,8 @@ cmake_dependent_option(USE_DIST_PACKAGES_FOR_PYTHON
 
 #--------------------------------------
 # Find gz-utils
-gz_find_package(gz-utils2 REQUIRED)
-set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR})
+gz_find_package(gz-utils3 REQUIRED)
+set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR})
 
 #--------------------------------------
 # Find eigen3

diff --git a/README.md b/README.md
@@ -9,9 +9,9 @@
 
 Build | Status
 -- | --
-Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-math/branch/gz-math7/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-math/branch/gz-math7)
-Ubuntu Focal  | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_math-ci-gz-math7-focal-amd64)](https://build.osrfoundation.org/job/ignition_math-ci-gz-math7-focal-amd64)
-Homebrew      | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_math-ci-gz-math7-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_math-ci-gz-math7-homebrew-amd64)
+Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-math/branch/gz-math8/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-math/branch/gz-math8)
+Ubuntu Focal  | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_math-ci-gz-math8-focal-amd64)](https://build.osrfoundation.org/job/ignition_math-ci-gz-math8-focal-amd64)
+Homebrew      | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_math-ci-gz-math8-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_math-ci-gz-math8-homebrew-amd64)
 Windows       | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ign_math-ci-win)](https://build.osrfoundation.org/job/ign_math-ci-win)
 
 Gazebo Math, a component of [Gazebo](https://gazebosim.org), provides general purpose math

diff --git a/tutorials/angle.md b/tutorials/angle.md
@@ -9,7 +9,7 @@ This tutorial explains how to use the `Angle` class from Gazebo Math library.
 Go to `gz-math/examples` and use `cmake` to compile the code:
 
 ```{.sh}
-git clone https://github.com/gazebosim/gz-math/ -b gz-math7
+git clone https://github.com/gazebosim/gz-math/ -b gz-math8
 cd gz-math/examples
 mkdir build
 cd build

diff --git a/tutorials/cppgetstarted.md b/tutorials/cppgetstarted.md
@@ -70,7 +70,7 @@ int main()
 To compile this code on UNIX with pkg-config, use the following command:
 
 ```{.bash}
-c++ $(pkg-config --cflags gz-math7) main.cpp -o main
+c++ $(pkg-config --cflags gz-math8) main.cpp -o main
 ```
 
 The program can then be run as:

diff --git a/tutorials/example_angle.md b/tutorials/example_angle.md
@@ -9,7 +9,7 @@ This tutorial explains how to use the `Angle` class from Gazebo Math library.
 Go to `gz-math/examples` and use `cmake` to compile the code:
 
 ```{.sh}
-git clone https://github.com/gazebosim/gz-math/ -b gz-math7
+git clone https://github.com/gazebosim/gz-math/ -b gz-math8
 cd gz-math/examples
 mkdir build
 cd build

diff --git a/tutorials/example_triangle.md b/tutorials/example_triangle.md
@@ -7,7 +7,7 @@ This tutorial explains how to use the `Triangle` class from Gazebo Math library.
 Go to `gz-math/examples` and use `cmake` to compile the code:
 
 ```{.sh}
-git clone https://github.com/gazebosim/gz-math/ -b gz-math7
+git clone https://github.com/gazebosim/gz-math/ -b gz-math8
 cd gz-math/examples
 mkdir build
 cd build

diff --git a/tutorials/example_vector2.md b/tutorials/example_vector2.md
@@ -9,7 +9,7 @@ This tutorial explains how to use the `Vector2` class from Gazebo Math library.
 To compile the code, go to `gz-math/examples` and use `cmake`:
 
 ```{.sh}
-git clone https://github.com/gazebosim/gz-math/ -b gz-math7
+git clone https://github.com/gazebosim/gz-math/ -b gz-math8
 cd gz-math/examples
 mkdir build
 cd build

diff --git a/tutorials/rotation.md b/tutorials/rotation.md
@@ -7,7 +7,7 @@ This example explains how to use quaternions and euler angles, and how to conver
 Go to `gz-math/examples` and use `cmake` to compile the code:
 
 ```{.sh}
-git clone https://github.com/gazebosim/gz-math/ -b gz-math7
+git clone https://github.com/gazebosim/gz-math/ -b gz-math8
 cd gz-math/examples
 mkdir build
 cd build

diff --git a/tutorials/rotation_example.md b/tutorials/rotation_example.md
@@ -7,7 +7,7 @@ This example explains how to use quaternions and euler angles, and how to conver
 Go to `gz-math/examples` and use `cmake` to compile the code:
 
 ```{.sh}
-git clone https://github.com/gazebosim/gz-math/ -b gz-math7
+git clone https://github.com/gazebosim/gz-math/ -b gz-math8
 cd gz-math/examples
 mkdir build
 cd build

diff --git a/tutorials/triangle.md b/tutorials/triangle.md
@@ -7,7 +7,7 @@ This tutorial explains how to use the `Triangle` class from Gazebo Math library.
 Go to `gz-math/examples` and use `cmake` to compile the code:
 
 ```{.sh}
-git clone https://github.com/gazebosim/gz-math/ -b gz-math7
+git clone https://github.com/gazebosim/gz-math/ -b gz-math8
 cd gz-math/examples
 mkdir build
 cd build

diff --git a/tutorials/vector.md b/tutorials/vector.md
@@ -9,7 +9,7 @@ This tutorial explains how to use the `Vector` classes from Gazebo Math library.
 To compile the code, go to `gz-math/examples` and use `cmake`:
 
 ```{.sh}
-git clone https://github.com/gazebosim/gz-math/ -b gz-math7
+git clone https://github.com/gazebosim/gz-math/ -b gz-math8
 cd gz-math/examples
 mkdir build
 cd build