Merge branch 'main' into arjo/feat/remove_systems_with_entities

Author: arjo129

.github/ISSUE_TEMPLATE/bug_report.md

@@ -5,7 +5,7 @@ labels: bug
 ---
 
 <!-- If you're not sure whether your problem is a bug, please ask a question at
-http://answers.gazebosim.org instead.-->
+https://robotics.stackexchange.com instead.-->
 
 ## Environment
 * OS Version: <!-- e.g, Ubuntu 20.04 -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -6,7 +6,7 @@ labels: enhancement
 
 <!-- If you're not sure on the specifics of the feature or would like a broader
 discussion, please consider posting a proposal to
-http://community.gazebosim.org/ instead.-->
+https://robotics.stackexchange.com instead.-->
 
 ## Desired behavior
 <!-- Describe the current problem and the feature you want implemented.-->

.github/ci/packages.apt

@@ -24,7 +24,6 @@ libtinyxml2-dev
 libxi-dev
 libxmu-dev
 libpython3-dev
-python3-distutils
 python3-gz-math8
 python3-gz-msgs11
 python3-gz-transport14

.github/workflows/ci.yml

@@ -4,6 +4,8 @@ on:
   pull_request:
   push:
     branches:
+      - 'ign-gazebo[0-9]'
+      - 'gz-sim[0-9]?'
       - 'main'
 
 # Every time you make a push to your PR, it cancel immediately the previous checks,
@@ -18,7 +20,7 @@ jobs:
     name: Ubuntu Jammy CI
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - uses: actions/setup-python@v3
       - uses: pre-commit/action@v3.0.0
         with:
@@ -32,3 +34,19 @@ jobs:
           codecov-enabled: true
           cppcheck-enabled: true
           cpplint-enabled: true
+  noble-ci:
+    runs-on: ubuntu-latest
+    name: Ubuntu Noble CI
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - uses: actions/setup-python@v3
+      - uses: pre-commit/action@v3.0.0
+        with:
+          extra_args: --all-files
+      - name: Compile and test
+        id: ci
+        uses: gazebo-tooling/action-gz-ci@noble
+        with:
+          # per bug https://github.com/gazebosim/gz-sim/issues/1409
+          cmake-args: '-DBUILD_DOCS=OFF'

.github/workflows/package_xml.yml

@@ -0,0 +1,11 @@
+name: Validate package.xml
+
+on:
+  pull_request:
+
+jobs:
+  package-xml:
+    runs-on: ubuntu-latest
+    name: Validate package.xml
+    steps:
+      - uses: gazebo-tooling/action-gz-ci/validate_package_xml@jammy

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 
 #============================================================================
 # Initialize the project
@@ -66,7 +66,7 @@ cmake_dependent_option(USE_DIST_PACKAGES_FOR_PYTHON
 #============================================================================
 
 # Setting this policy enables using the protobuf_MODULE_COMPATIBLE
-# set command in CMake versions older than 13.13
+# set command when cmake_minimum_required is less than 3.13
 set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 # This option is needed to use the PROTOBUF_GENERATE_CPP
 # in case protobuf is found with the CMake config files
@@ -225,11 +225,17 @@ else()
   endif()
 endif()
 # Plugin install dirs
+set(GZ_SIM_PLUGIN_RELATIVE_INSTALL_DIR
+  ${GZ_LIB_INSTALL_DIR}/gz-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins
+)
 set(GZ_SIM_PLUGIN_INSTALL_DIR
-  ${CMAKE_INSTALL_PREFIX}/${GZ_LIB_INSTALL_DIR}/gz-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins
+  ${CMAKE_INSTALL_PREFIX}/${GZ_SIM_PLUGIN_RELATIVE_INSTALL_DIR}
+)
+set(GZ_SIM_GUI_PLUGIN_RELATIVE_INSTALL_DIR
+  ${GZ_LIB_INSTALL_DIR}/gz-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins/gui
 )
 set(GZ_SIM_GUI_PLUGIN_INSTALL_DIR
-  ${CMAKE_INSTALL_PREFIX}/${GZ_LIB_INSTALL_DIR}/gz-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins/gui
+  ${CMAKE_INSTALL_PREFIX}/${GZ_SIM_GUI_PLUGIN_RELATIVE_INSTALL_DIR}
 )
 
 #============================================================================
@@ -244,7 +250,7 @@ add_subdirectory(examples)
 #============================================================================
 gz_create_packages()
 
-if (pybind11_FOUND)
+if (pybind11_FOUND AND NOT SKIP_PYBIND11)
 	add_subdirectory(python)
 endif()
 #============================================================================