Merge branch 'master' into azeey/add_cmake_version_sanity_check

gazebo-tooling · Dec 19, 2024 · c337964 · c337964
2 parents b52561a + ba1938b
commit c337964
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml
@@ -434,7 +434,7 @@ collections:
         - brew
       linux:
         ignore_major_version:
-          - gz-ionic
+          - gz-jetty
   - name: '__upcoming__'
     libs:
       - name: gz-tools

diff --git a/jenkins-scripts/dsl/logs/generated_jobs.txt b/jenkins-scripts/dsl/logs/generated_jobs.txt
@@ -600,8 +600,8 @@ install_ci jetty gz_fuel_tools10-install-pkg-noble-amd64
 install_ci jetty gz_fuel_tools10-install_bottle-homebrew-amd64
 install_ci jetty gz_gui9-install-pkg-noble-amd64
 install_ci jetty gz_gui9-install_bottle-homebrew-amd64
-install_ci jetty gz_jetty1-install-pkg-noble-amd64
-install_ci jetty gz_jetty1-install_bottle-homebrew-amd64
+install_ci jetty gz_jetty-install-pkg-noble-amd64
+install_ci jetty gz_jetty-install_bottle-homebrew-amd64
 install_ci jetty gz_launch8-install-pkg-noble-amd64
 install_ci jetty gz_launch8-install_bottle-homebrew-amd64
 install_ci jetty gz_math8-install-pkg-noble-amd64
@@ -627,4 +627,3 @@ install_ci jetty gz_utils3-install_bottle-homebrew-amd64
 install_ci jetty sdformat15-install-pkg-noble-amd64
 install_ci jetty sdformat15-install_bottle-homebrew-amd64
 unofficial_wrappers_install_pkg_ci harmonic ros_gzharmonic_bridge-install-pkg_humble-ci-jammy-amd64
-unofficial_wrappers_install_pkg_ci harmonic ros_gzharmonic_bridge-install-pkg_iron-ci-jammy-amd64
diff --git a/jenkins-scripts/dsl/ros_gz_bridge.dsl b/jenkins-scripts/dsl/ros_gz_bridge.dsl
@@ -13,7 +13,7 @@ def bridge_packages = [
 ]
 
 def unofficial_combinations = [
-  'harmonic' : ['humble', 'iron']
+  'harmonic' : ['humble']
 ]
 
 logging_list = [:]

diff --git a/jenkins-scripts/lib/colcon-default-devel-windows.bat b/jenkins-scripts/lib/colcon-default-devel-windows.bat
@@ -35,6 +35,11 @@ if "%COLCON_AUTO_MAJOR_VERSION%" == "true" (
    echo "MAJOR_VERSION detected: !PKG_MAJOR_VERSION!"
 )
 
+echo # BEGIN SECTION: dxdiag info
+set DXDIAG_FILE=%WORKSPACE%\dxdiag.txt
+dxdiag /t %DXDIAG_FILE%
+type %DXDIAG_FILE%
+echo # END SECTION
 
 setlocal ENABLEDELAYEDEXPANSION
 if not defined GAZEBODISTRO_FILE (