From bec2e7722619c6aba2574255d59eca9be642383b Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Fri, 11 Mar 2022 11:45:07 -0800 Subject: [PATCH 1/3] Remove Bionic from future releases (Garden+) Signed-off-by: Louise Poubel --- .github/workflows/ci.yml | 15 +++------------ README.md | 2 +- test/integration/camera.cc | 17 ----------------- tutorials/02_install.md | 4 +--- 4 files changed, 5 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 53e67b817..3111a15bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,18 +3,6 @@ name: Ubuntu CI on: [push, pull_request] jobs: - bionic-ci: - runs-on: ubuntu-latest - name: Ubuntu Bionic CI - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Compile and test - id: ci - uses: ignition-tooling/action-ignition-ci@bionic - with: - codecov-enabled: true - doxygen-enabled: true focal-ci: runs-on: ubuntu-latest name: Ubuntu Focal CI @@ -24,3 +12,6 @@ jobs: - name: Compile and test id: ci uses: ignition-tooling/action-ignition-ci@focal + with: + codecov-enabled: true + doxygen-enabled: true diff --git a/README.md b/README.md index e6e6cfed3..2dc37b502 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Build | Status -- | -- Test coverage | [![codecov](https://codecov.io/gh/ignitionrobotics/ign-rendering/branch/main/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-rendering/branch/default) -Ubuntu Bionic | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_rendering-ci-main-bionic-amd64)](https://build.osrfoundation.org/job/ignition_rendering-ci-main-bionic-amd64) +Ubuntu Focal | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_rendering-ci-main-focal-amd64)](https://build.osrfoundation.org/job/ignition_rendering-ci-main-focal-amd64) Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_rendering-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_rendering-ci-main-homebrew-amd64) Windows | [![Build Status](https://build.osrfoundation.org/job/ign_rendering-ci-win/badge/icon)](https://build.osrfoundation.org/job/ign_rendering-ci-win/) diff --git a/test/integration/camera.cc b/test/integration/camera.cc index 92fd0f252..c28512fb5 100644 --- a/test/integration/camera.cc +++ b/test/integration/camera.cc @@ -570,23 +570,6 @@ void CameraTest::ShaderSelection(const std::string &_renderEngine) << _renderEngine << std::endl; return; } - else if (_renderEngine == "ogre2") - { - // \todo(anyone) test fails on github action (Bionic) but pass on other - // builds. Need to investigate further. - // Github action sets the MESA_GL_VERSION_OVERRIDE variable - // so check for this variable and disable test if it is set. -#ifdef __linux__ - std::string value; - bool result = common::env("MESA_GL_VERSION_OVERRIDE", value, true); - if (result && value == "3.3") - { - igndbg << "Test is run on machine with software rendering or mesa driver " - << "Skipping test. " << std::endl; - return; - } -#endif - } // This test checks that custom shaders are being rendering correctly in // camera view. It also verifies that visual selection is working and the diff --git a/tutorials/02_install.md b/tutorials/02_install.md index 6a5b5a7f9..453456e2f 100644 --- a/tutorials/02_install.md +++ b/tutorials/02_install.md @@ -40,7 +40,7 @@ Be sure to replace `<#>` with a number value, such as `1` or `2`, depending on w ### Prerequisites -Ubuntu Bionic 18.04 or above: +Ubuntu Focal 20.04 or above: Install dependencies: ``` @@ -49,7 +49,6 @@ sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `ls wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add - sudo apt update sudo apt install -y \ - g++-8 \ cmake \ pkg-config \ git \ @@ -62,7 +61,6 @@ sudo apt install -y \ libignition-math7-dev \ libignition-common5-dev \ libignition-plugin-dev -sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8 --slave /usr/bin/gcov gcov /usr/bin/gcov-8 ``` ### Supported Rendering Engines From 7642d1970960bf0fd897db1db6cddaae058849d8 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Fri, 11 Mar 2022 12:37:10 -0800 Subject: [PATCH 2/3] doxy Signed-off-by: Louise Poubel --- include/ignition/rendering/HeightmapDescriptor.hh | 6 +++--- include/ignition/rendering/Mesh.hh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/ignition/rendering/HeightmapDescriptor.hh b/include/ignition/rendering/HeightmapDescriptor.hh index c1b65ce19..51edde666 100644 --- a/include/ignition/rendering/HeightmapDescriptor.hh +++ b/include/ignition/rendering/HeightmapDescriptor.hh @@ -190,8 +190,8 @@ inline namespace IGNITION_RENDERING_VERSION_NAMESPACE { /// \return The heightmap's size. public: ignition::math::Vector3d Size() const; - /// \brief Set the heightmap's scaling factor. Defaults to 1x1x1. - /// \return The heightmap's size factor. + /// \brief Set the heightmap's size. Defaults to 1x1x1. + /// \param[in] _size The heightmap's size. public: void SetSize(const ignition::math::Vector3d &_size); /// \brief Get the heightmap's position offset. @@ -199,7 +199,7 @@ inline namespace IGNITION_RENDERING_VERSION_NAMESPACE { public: ignition::math::Vector3d Position() const; /// \brief Set the heightmap's position offset. - /// \return The heightmap's position offset. + /// \param[in] _position The heightmap's position offset. public: void SetPosition(const ignition::math::Vector3d &_position); /// \brief Get whether the heightmap uses terrain paging. diff --git a/include/ignition/rendering/Mesh.hh b/include/ignition/rendering/Mesh.hh index a98c96790..46de7551d 100644 --- a/include/ignition/rendering/Mesh.hh +++ b/include/ignition/rendering/Mesh.hh @@ -121,8 +121,8 @@ namespace ignition public: virtual SubMeshPtr SubMeshByIndex( unsigned int _index) const = 0; - /// \brief Set the mesh's mesh descriptor - /// \return The mesh's mesh descriptor + /// \brief Set the mesh's descriptor + /// \param[in] _desc The new mesh descriptor public: virtual void SetDescriptor(const MeshDescriptor &_desc) = 0; /// \brief Get the mesh's mesh descriptor From 897fad9fb41f1051421f776dfd0036f7daec731c Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Fri, 11 Mar 2022 14:31:07 -0800 Subject: [PATCH 3/3] enable static checkers Signed-off-by: Louise Poubel --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3111a15bc..eab3e7460 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,4 +14,6 @@ jobs: uses: ignition-tooling/action-ignition-ci@focal with: codecov-enabled: true + cppcheck-enabled: true + cpplint-enabled: true doxygen-enabled: true