Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update deps for Dome: use msgs6, transport9, sdf10 #31

Merged
merged 7 commits into from
Jul 29, 2020
Merged

Update deps for Dome: use msgs6, transport9, sdf10 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aedad7c
Update deps for Dome: use msgs6, transport9, sdf10
j-rivero Jul 10, 2020
cf9a8bc
bump deps on actions
chapulina Jul 18, 2020
0464207
Merge branch 'master' into update_dome_versions
chapulina Jul 21, 2020
375a265
install after make on CI
chapulina Jul 27, 2020
cc877e2
install xvfb
chapulina Jul 27, 2020
f8755ff
set -e
chapulina Jul 27, 2020
e0be114
Use EXPECT_NEAR for DepthCameraSensorTest to make github actions happy
j-rivero Jul 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/ci-bionic/after_make.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh -l

set -x
set -e

chapulina marked this conversation as resolved.
Show resolved Hide resolved
# Install (needed for some tests)
make install

Xvfb :1 -screen 0 1280x1024x24 &
j-rivero marked this conversation as resolved.
Show resolved Hide resolved
export DISPLAY=:1.0
export RENDER_ENGINE_VALUES=ogre2
export MESA_GL_VERSION_OVERRIDE=3.3
7 changes: 4 additions & 3 deletions .github/workflows/ci-bionic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ jobs:
libignition-cmake2-dev
libignition-common3-dev
libignition-math6-dev
libignition-msgs5-dev
libignition-msgs6-dev
libignition-tools-dev
libignition-plugin-dev
libignition-transport8-dev
libsdformat9-dev
libignition-transport9-dev
libsdformat10-dev
libogre-1.9-dev
libogre-2.1-dev
libglew-dev
Expand All @@ -31,4 +31,5 @@ jobs:
libxmu-dev
libxi-dev
uuid-dev
xvfb
codecov-token: ${{ secrets.CODECOV_TOKEN }}
12 changes: 6 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ set(IGN_COMMON_VER ${ignition-common3_VERSION_MAJOR})

#--------------------------------------
# Find ignition-transport
ign_find_package(ignition-transport8 REQUIRED)
set(IGN_TRANSPORT_VER ${ignition-transport8_VERSION_MAJOR})
ign_find_package(ignition-transport9 REQUIRED)
set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR})

#--------------------------------------
# Find ignition-rendering
Expand All @@ -75,8 +75,8 @@ endif()

#--------------------------------------
# Find ignition-msgs
ign_find_package(ignition-msgs5 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs5_VERSION_MAJOR})
ign_find_package(ignition-msgs6 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs6_VERSION_MAJOR})

#--------------------------------------
# Find ignition-plugin
Expand All @@ -85,8 +85,8 @@ set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})

#--------------------------------------
# Find SDFormat
ign_find_package(sdformat9 VERSION 9.2 REQUIRED)
set(SDF_VER ${sdformat9_VERSION_MAJOR})
ign_find_package(sdformat10 REQUIRED)
set(SDF_VER ${sdformat10_VERSION_MAJOR})

set(IGN_SENSORS_PLUGIN_PATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})

Expand Down
4 changes: 2 additions & 2 deletions test/integration/depth_camera_plugin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ void DepthCameraSensorTest::ImagesWithBuiltinSDF(
for (unsigned int j = 0; j < depthSensor->ImageWidth(); ++j)
{
float d = g_depthBuffer[step + j];
EXPECT_FLOAT_EQ(expectedDepth, d);
EXPECT_NEAR(expectedDepth, d, DOUBLE_TOL);
}
}
}
Expand All @@ -445,7 +445,7 @@ void DepthCameraSensorTest::ImagesWithBuiltinSDF(
for (unsigned int j = 0; j < depthSensor->ImageWidth(); ++j)
{
float x = g_pointsXYZBuffer[step + j*3];
EXPECT_FLOAT_EQ(expectedDepth, x);
EXPECT_NEAR(expectedDepth, x, DOUBLE_TOL);
}
}

Expand Down