Setup rendering environment before cmake runs (#1965)

CMake checks if rendering is available to enable some tests, so the rendering environment needs to be set before CMake runs. --------- Signed-off-by: Addisu Z. Taddese <[email protected]>
gazebosim · Mar 25, 2024 · a3e9f8d · a3e9f8d
1 parent c8aec3f
commit a3e9f8d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/.github/ci/after_make.sh b/.github/ci/after_make.sh
@@ -4,12 +4,3 @@ set -x
 
 # Install (needed for some tests)
 make install
-
-# For ign-tools
-export IGN_CONFIG_PATH=/usr/local/share/ignition
-
-# For rendering / window tests
-Xvfb :1 -screen 0 1280x1024x24 &
-export DISPLAY=:1.0
-export RENDER_ENGINE_VALUES=ogre2
-export MESA_GL_VERSION_OVERRIDE=3.3
diff --git a/.github/ci/before_cmake.sh b/.github/ci/before_cmake.sh
@@ -0,0 +1,9 @@
+#!/bin/sh -l
+
+set -x
+
+# For rendering / window tests
+Xvfb :1 -screen 0 1280x1024x24 &
+export DISPLAY=:1.0
+export RENDER_ENGINE_VALUES=ogre2
+export MESA_GL_VERSION_OVERRIDE=3.3
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
@@ -13,3 +13,5 @@ libignition-transport8-dev
 libsdformat9-dev
 qml-module-qtqml-models2
 xvfb
+x11-utils
+mesa-utils
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,6 +20,7 @@ jobs:
         uses: ignition-tooling/action-ignition-ci@bionic
         with:
           codecov-enabled: true
+          cmake-args: "-DCMAKE_INSTALL_PREFIX=/usr"
   focal-ci:
     runs-on: ubuntu-latest
     name: Ubuntu Focal CI
@@ -29,3 +30,5 @@ jobs:
       - name: Compile and test
         id: ci
         uses: ignition-tooling/action-ignition-ci@focal
+        with:
+          cmake-args: "-DCMAKE_INSTALL_PREFIX=/usr"
diff --git a/include/gz/sim/playback_server.config b/include/gz/sim/playback_server.config
@@ -3,12 +3,12 @@
     <plugin entity_name="*"
             entity_type="world"
             filename="ignition-gazebo-user-commands-system"
-            name="sim::systems::UserCommands">
+            name="gz::sim::systems::UserCommands">
     </plugin>
     <plugin entity_name="*"
             entity_type="world"
             filename="ignition-gazebo-scene-broadcaster-system"
-            name="sim::systems::SceneBroadcaster">
+            name="gz::sim::systems::SceneBroadcaster">
     </plugin>
   </plugins>
 </server_config>