From 430f9f600113f1add1b25468f8d4e20982ed4c2b Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Fri, 6 Oct 2023 17:07:15 -0500 Subject: [PATCH 1/3] Bumps in ionic : ci_matching_branch/bump_ionic_gz-math8 Signed-off-by: Addisu Z. Taddese --- .github/ci/packages.apt | 4 ++-- CMakeLists.txt | 8 ++++---- README.md | 6 +++--- src/Quaternion_TEST.cc | 4 ++-- tutorials/angle.md | 2 +- tutorials/cppgetstarted.md | 2 +- tutorials/example_angle.md | 2 +- tutorials/example_triangle.md | 2 +- tutorials/example_vector2.md | 2 +- tutorials/rotation.md | 2 +- tutorials/rotation_example.md | 2 +- tutorials/triangle.md | 2 +- tutorials/vector.md | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 09f6e9c5b..fbdc0c36d 100644 --- 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/CMakeLists.txt b/CMakeLists.txt index 24cb19c33..439088a0b 100644 --- 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 index ed3efb770..a5a305ad5 100644 --- 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/src/Quaternion_TEST.cc b/src/Quaternion_TEST.cc index 865e4bdc6..922ebbbc8 100644 --- a/src/Quaternion_TEST.cc +++ b/src/Quaternion_TEST.cc @@ -326,11 +326,11 @@ TEST(QuaternionTest, MathAxis) math::Quaterniond q(GZ_PI*0.1, GZ_PI*0.5, GZ_PI); GZ_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION - // Deprecated in gz-math7 + // Deprecated in gz-math8 q.Axis(0, 1, 0, GZ_PI); EXPECT_EQ(q, math::Quaterniond(6.12303e-17, 0, 1, 0)); - // Deprecated in gz-math7 + // Deprecated in gz-math8 q.Axis(1, 0, 0, GZ_PI); EXPECT_EQ(q, math::Quaterniond(0, 1, 0, 0)); GZ_UTILS_WARN_RESUME__DEPRECATED_DECLARATION diff --git a/tutorials/angle.md b/tutorials/angle.md index f06090f31..ad468160e 100644 --- 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 index c3c3f06be..90fbdcb33 100644 --- 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 index 219efa818..00e660272 100644 --- 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 index 0f3866862..f00f136f3 100644 --- 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 index 68dcc3618..f16216910 100644 --- 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 index 59eae34f2..7bcdb0681 100644 --- 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 index a4df77a9c..0a077a62c 100644 --- 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 index 10386f2d8..a2580cce0 100644 --- 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 index 44a503acf..f32df1353 100644 --- 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 From fdc2cfc9a12e6888929b4757ed40825b29bb1c78 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 12 Oct 2023 18:04:43 -0500 Subject: [PATCH 2/3] Revert version change in comment Signed-off-by: Addisu Z. Taddese --- src/Quaternion_TEST.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Quaternion_TEST.cc b/src/Quaternion_TEST.cc index 922ebbbc8..865e4bdc6 100644 --- a/src/Quaternion_TEST.cc +++ b/src/Quaternion_TEST.cc @@ -326,11 +326,11 @@ TEST(QuaternionTest, MathAxis) math::Quaterniond q(GZ_PI*0.1, GZ_PI*0.5, GZ_PI); GZ_UTILS_WARN_IGNORE__DEPRECATED_DECLARATION - // Deprecated in gz-math8 + // Deprecated in gz-math7 q.Axis(0, 1, 0, GZ_PI); EXPECT_EQ(q, math::Quaterniond(6.12303e-17, 0, 1, 0)); - // Deprecated in gz-math8 + // Deprecated in gz-math7 q.Axis(1, 0, 0, GZ_PI); EXPECT_EQ(q, math::Quaterniond(0, 1, 0, 0)); GZ_UTILS_WARN_RESUME__DEPRECATED_DECLARATION From 5324dd057d2d14397b448a25c3d90769b0a7618a Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Fri, 13 Oct 2023 10:03:02 -0500 Subject: [PATCH 3/3] Remove focal CI Signed-off-by: Addisu Z. Taddese --- .github/workflows/ci.yml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9b705f0ca..ab45c9400 100644 --- 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