Merge ign-gazebo3 ➡️ ign-gazebo6

.github/ci/after_make.sh

@@ -6,12 +6,3 @@ set -e
 # Install (needed for some tests)
 make install
 export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib
-
-# 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

.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

.github/ci/packages.apt

@@ -38,3 +38,5 @@ qtdeclarative5-dev
 qtquickcontrols2-5-dev
 uuid-dev
 xvfb
+x11-utils
+mesa-utils

.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,6 +30,8 @@ jobs:
       - name: Compile and test
         id: ci
         uses: ignition-tooling/action-ignition-ci@focal
+        with:
+          cmake-args: "-DCMAKE_INSTALL_PREFIX=/usr"
   jammy-ci:
     runs-on: ubuntu-latest
     name: Ubuntu Jammy CI
@@ -40,4 +43,4 @@ jobs:
         uses: ignition-tooling/action-ignition-ci@jammy
         with:
           # per bug https://github.com/ignitionrobotics/ign-gazebo/issues/1409
-          cmake-args: '-DBUILD_DOCS=OFF'
+          cmake-args: '-DCMAKE_INSTALL_PREFIX=/usr -DBUILD_DOCS=OFF'

Changelog.md

@@ -2439,6 +2439,36 @@
 
 ## Gazebo Sim 3.x
 
+### Gazebo Sim 3.15.1 (2024-01-05)
+
+1. Update github action workflows
+    * [Pull request #2237](https://github.com/gazebosim/gz-sim/pull/2237)
+    * [Pull request #1988](https://github.com/gazebosim/gz-sim/pull/1988)
+
+1. Fix macOS test failures by registering components in the core library
+    * [Pull request #2220](https://github.com/gazebosim/gz-sim/pull/2220)
+
+1. Bump Fuel model version in test
+    * [Pull request #2190](https://github.com/gazebosim/gz-sim/pull/2190)
+
+1. Fix a minor issue in the documentation of the server API
+    * [Pull request #2067](https://github.com/gazebosim/gz-sim/pull/2067)
+
+1. Use sdf::Element::FindElement instead of GetElement in ApplyLinkWrench
+    * [Pull request #2052](https://github.com/gazebosim/gz-sim/pull/2052)
+
+1. Adds a warning if the `Server` method of a `TestFixture` is called before `Finalize`
+    * [Pull request #2047](https://github.com/gazebosim/gz-sim/pull/2047)
+
+1. Protobuf: Do not require version 3 do support Protobuf 4.23.2 (23.2)
+    * [Pull request #2006](https://github.com/gazebosim/gz-sim/pull/2006)
+
+1. Print an error message when trying to load SDF files that don't contain a `<world>`
+    * [Pull request #1998](https://github.com/gazebosim/gz-sim/pull/1998)
+
+1.  Enable GzWeb visualization of markers by republishing service requests on a topic
+    * [Pull request #1994](https://github.com/gazebosim/gz-sim/pull/1994)
+
 ### Gazebo Sim 3.15.0 (2023-05-08)
 
 1. Speed up Resource Spawner load time by fetching model list asynchronously

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>