Skip to content

Commit 23955a9

Browse files
chapulinascpeters
andauthored
Remove Bionic from future releases (Garden+) (#583)
Signed-off-by: Louise Poubel <[email protected]> Co-authored-by: Steve Peters <[email protected]>
1 parent 8cc48ac commit 23955a9

File tree

6 files changed

+11
-37
lines changed

6 files changed

+11
-37
lines changed

.github/workflows/ci.yml

+5-12
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,6 @@ name: Ubuntu CI
33
on: [push, pull_request]
44

55
jobs:
6-
bionic-ci:
7-
runs-on: ubuntu-latest
8-
name: Ubuntu Bionic CI
9-
steps:
10-
- name: Checkout
11-
uses: actions/checkout@v2
12-
- name: Compile and test
13-
id: ci
14-
uses: ignition-tooling/action-ignition-ci@bionic
15-
with:
16-
codecov-enabled: true
17-
doxygen-enabled: true
186
focal-ci:
197
runs-on: ubuntu-latest
208
name: Ubuntu Focal CI
@@ -24,3 +12,8 @@ jobs:
2412
- name: Compile and test
2513
id: ci
2614
uses: ignition-tooling/action-ignition-ci@focal
15+
with:
16+
codecov-enabled: true
17+
cppcheck-enabled: true
18+
cpplint-enabled: true
19+
doxygen-enabled: true

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Build | Status
1111
-- | --
1212
Test coverage | [![codecov](https://codecov.io/gh/ignitionrobotics/ign-rendering/branch/main/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-rendering/branch/default)
13-
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)
13+
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)
1414
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)
1515
Windows | [![Build Status](https://build.osrfoundation.org/job/ign_rendering-ci-win/badge/icon)](https://build.osrfoundation.org/job/ign_rendering-ci-win/)
1616

include/ignition/rendering/HeightmapDescriptor.hh

+2-2
Original file line numberDiff line numberDiff line change
@@ -191,15 +191,15 @@ inline namespace IGNITION_RENDERING_VERSION_NAMESPACE {
191191
public: ignition::math::Vector3d Size() const;
192192

193193
/// \brief Set the heightmap's final size in world units. Defaults to 1x1x1.
194-
/// \return The heightmap's size factor.
194+
/// \param[in] _size The heightmap's size factor.
195195
public: void SetSize(const ignition::math::Vector3d &_size);
196196

197197
/// \brief Get the heightmap's position offset.
198198
/// \return The heightmap's position offset.
199199
public: ignition::math::Vector3d Position() const;
200200

201201
/// \brief Set the heightmap's position offset.
202-
/// \return The heightmap's position offset.
202+
/// \param[in] _position The heightmap's position offset.
203203
public: void SetPosition(const ignition::math::Vector3d &_position);
204204

205205
/// \brief Get whether the heightmap uses terrain paging.

include/ignition/rendering/Mesh.hh

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ namespace ignition
121121
public: virtual SubMeshPtr SubMeshByIndex(
122122
unsigned int _index) const = 0;
123123

124-
/// \brief Set the mesh's mesh descriptor
125-
/// \return The mesh's mesh descriptor
124+
/// \brief Set the mesh's descriptor
125+
/// \param[in] _desc The new mesh descriptor
126126
public: virtual void SetDescriptor(const MeshDescriptor &_desc) = 0;
127127

128128
/// \brief Get the mesh's mesh descriptor

test/integration/camera.cc

-17
Original file line numberDiff line numberDiff line change
@@ -570,23 +570,6 @@ void CameraTest::ShaderSelection(const std::string &_renderEngine)
570570
<< _renderEngine << std::endl;
571571
return;
572572
}
573-
else if (_renderEngine == "ogre2")
574-
{
575-
// \todo(anyone) test fails on github action (Bionic) but pass on other
576-
// builds. Need to investigate further.
577-
// Github action sets the MESA_GL_VERSION_OVERRIDE variable
578-
// so check for this variable and disable test if it is set.
579-
#ifdef __linux__
580-
std::string value;
581-
bool result = common::env("MESA_GL_VERSION_OVERRIDE", value, true);
582-
if (result && value == "3.3")
583-
{
584-
igndbg << "Test is run on machine with software rendering or mesa driver "
585-
<< "Skipping test. " << std::endl;
586-
return;
587-
}
588-
#endif
589-
}
590573

591574
// This test checks that custom shaders are being rendering correctly in
592575
// camera view. It also verifies that visual selection is working and the

tutorials/02_install.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Be sure to replace `<#>` with a number value, such as `1` or `2`, depending on w
4040

4141
### Prerequisites
4242

43-
Ubuntu Bionic 18.04 or above:
43+
Ubuntu Focal 20.04 or above:
4444

4545
Install dependencies:
4646
```
@@ -49,7 +49,6 @@ sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `ls
4949
wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add -
5050
sudo apt update
5151
sudo apt install -y \
52-
g++-8 \
5352
cmake \
5453
pkg-config \
5554
git \
@@ -62,7 +61,6 @@ sudo apt install -y \
6261
libignition-math7-dev \
6362
libignition-common5-dev \
6463
libignition-plugin-dev
65-
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
6664
```
6765

6866
### Supported Rendering Engines

0 commit comments

Comments
 (0)