Merge branch 'master' into jrivero/define_win_conda_ci

Author: j-rivero

conda/envs/legacy/pixi.lock

@@ -35,6 +35,7 @@ ruby = "3.2.*"
 tinyxml2 = "*"
 yaml = "*"
 zeromq = "4.3.4"
+cli11 = "2.1.2.*"
 
 [target.win-64.dependencies]
 dlfcn-win32 = "*"

conda/envs/legacy/pixi.toml

@@ -322,9 +322,9 @@ collections:
         repo:
           current_branch: gz-transport14
       - name: gz-gui
-        major_version: 9
+        major_version: 10
         repo:
-          current_branch: gz-gui9
+          current_branch: main
       - name: gz-sensors
         major_version: 9
         repo:
@@ -334,13 +334,13 @@ collections:
         repo:
           current_branch: gz-physics8
       - name: gz-sim
-        major_version: 9
+        major_version: 10
         repo:
-          current_branch: gz-sim9
+          current_branch: main
       - name: gz-launch
-        major_version: 8
+        major_version: 9
         repo:
-          current_branch: gz-launch8
+          current_branch: main
       - name: gz-jetty
         major_version: 1
         repo:

jenkins-scripts/dsl/gz-collections.yaml

@@ -65,15 +65,15 @@ asan_ci ionic sdformat-ci_asan-sdf15-noble-amd64
 asan_ci jetty gz_cmake-ci_asan-gz-cmake4-noble-amd64
 asan_ci jetty gz_common-ci_asan-gz-common6-noble-amd64
 asan_ci jetty gz_fuel_tools-ci_asan-gz-fuel-tools10-noble-amd64
-asan_ci jetty gz_gui-ci_asan-gz-gui9-noble-amd64
-asan_ci jetty gz_launch-ci_asan-gz-launch8-noble-amd64
+asan_ci jetty gz_gui-ci_asan-main-noble-amd64
+asan_ci jetty gz_launch-ci_asan-main-noble-amd64
 asan_ci jetty gz_math-ci_asan-gz-math8-noble-amd64
 asan_ci jetty gz_msgs-ci_asan-gz-msgs11-noble-amd64
 asan_ci jetty gz_physics-ci_asan-gz-physics8-noble-amd64
 asan_ci jetty gz_plugin-ci_asan-gz-plugin3-noble-amd64
 asan_ci jetty gz_rendering-ci_asan-gz-rendering9-noble-amd64
 asan_ci jetty gz_sensors-ci_asan-gz-sensors9-noble-amd64
-asan_ci jetty gz_sim-ci_asan-gz-sim9-noble-amd64
+asan_ci jetty gz_sim-ci_asan-main-noble-amd64
 asan_ci jetty gz_tools-ci_asan-gz-tools2-noble-amd64
 asan_ci jetty gz_transport-ci_asan-gz-transport14-noble-amd64
 asan_ci jetty gz_utils-ci_asan-gz-utils3-noble-amd64
@@ -295,12 +295,12 @@ branch_ci jetty gz_common-ci-gz-common6-noble-amd64
 branch_ci jetty gz_fuel_tools-10-win
 branch_ci jetty gz_fuel_tools-ci-gz-fuel-tools10-homebrew-amd64
 branch_ci jetty gz_fuel_tools-ci-gz-fuel-tools10-noble-amd64
-branch_ci jetty gz_gui-9-win
-branch_ci jetty gz_gui-ci-gz-gui9-homebrew-amd64
-branch_ci jetty gz_gui-ci-gz-gui9-noble-amd64
-branch_ci jetty gz_launch-8-win
-branch_ci jetty gz_launch-ci-gz-launch8-homebrew-amd64
-branch_ci jetty gz_launch-ci-gz-launch8-noble-amd64
+branch_ci jetty gz_gui-ci-main-homebrew-amd64
+branch_ci jetty gz_gui-ci-main-noble-amd64
+branch_ci jetty gz_gui-main-win
+branch_ci jetty gz_launch-ci-main-homebrew-amd64
+branch_ci jetty gz_launch-ci-main-noble-amd64
+branch_ci jetty gz_launch-main-win
 branch_ci jetty gz_math-8-win
 branch_ci jetty gz_math-ci-gz-math8-homebrew-amd64
 branch_ci jetty gz_math-ci-gz-math8-noble-amd64
@@ -319,9 +319,9 @@ branch_ci jetty gz_rendering-ci-gz-rendering9-noble-amd64
 branch_ci jetty gz_sensors-9-win
 branch_ci jetty gz_sensors-ci-gz-sensors9-homebrew-amd64
 branch_ci jetty gz_sensors-ci-gz-sensors9-noble-amd64
-branch_ci jetty gz_sim-9-win
-branch_ci jetty gz_sim-ci-gz-sim9-homebrew-amd64
-branch_ci jetty gz_sim-ci-gz-sim9-noble-amd64
+branch_ci jetty gz_sim-ci-main-homebrew-amd64
+branch_ci jetty gz_sim-ci-main-noble-amd64
+branch_ci jetty gz_sim-main-win
 branch_ci jetty gz_tools-2-win
 branch_ci jetty gz_tools-ci-gz-tools2-homebrew-amd64
 branch_ci jetty gz_tools-ci-gz-tools2-noble-amd64
@@ -508,12 +508,12 @@ install_ci jetty gz_common6-install-pkg-noble-amd64
 install_ci jetty gz_common6-install_bottle-homebrew-amd64
 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_gui10-install-pkg-noble-amd64
+install_ci jetty gz_gui10-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_launch9-install-pkg-noble-amd64
+install_ci jetty gz_launch9-install_bottle-homebrew-amd64
 install_ci jetty gz_math8-install-pkg-noble-amd64
 install_ci jetty gz_math8-install_bottle-homebrew-amd64
 install_ci jetty gz_msgs11-install-pkg-noble-amd64
@@ -526,8 +526,8 @@ install_ci jetty gz_rendering9-install-pkg-noble-amd64
 install_ci jetty gz_rendering9-install_bottle-homebrew-amd64
 install_ci jetty gz_sensors9-install-pkg-noble-amd64
 install_ci jetty gz_sensors9-install_bottle-homebrew-amd64
-install_ci jetty gz_sim9-install-pkg-noble-amd64
-install_ci jetty gz_sim9-install_bottle-homebrew-amd64
+install_ci jetty gz_sim10-install-pkg-noble-amd64
+install_ci jetty gz_sim10-install_bottle-homebrew-amd64
 install_ci jetty gz_tools2-install-pkg-noble-amd64
 install_ci jetty gz_tools2-install_bottle-homebrew-amd64
 install_ci jetty gz_transport14-install-pkg-noble-amd64

jenkins-scripts/dsl/logs/generated_jobs.txt

@@ -27,6 +27,7 @@ set LOCAL_WS_BUILD=%WORKSPACE%\build
 @if "%BUILD_TYPE%" == "" set BUILD_TYPE=Release
 @if "%ENABLE_TESTS%" == "" set ENABLE_TESTS=TRUE
 @if "%COLCON_AUTO_MAJOR_VERSION%" == "" set COLCON_AUTO_MAJOR_VERSION=false
+@if "%CONDA_ENV_NAME%" == "" set CONDA_ENV_NAME=legacy
 
 setlocal ENABLEDELAYEDEXPANSION
 if "%COLCON_AUTO_MAJOR_VERSION%" == "true" (
@@ -88,8 +89,8 @@ if defined USE_PIXI (
     call %win_lib% :pixi_installation || goto :error
     echo # END SECTION
 
-    echo # BEGIN SECTION: pixi: create legacy environment
-    call %win_lib% :pixi_create_gz_environment_legacy || goto :error
+    echo # BEGIN SECTION: pixi: create %CONDA_ENV_NAME% environment
+    call %win_lib% :pixi_create_gz_environment %CONDA_ENV_NAME% || goto :error
     echo # END SECTION
   )
 

jenkins-scripts/lib/colcon-default-devel-windows.bat

@@ -36,6 +36,6 @@ if NOT DEFINED VCPKG_SNAPSHOT (
   set VCPKG_SNAPSHOT=2022.02.23
 )
 :: Set of common gz dependencies expected up to Garden
-set VCPKG_DEPENDENCIES_LEGACY=assimp boost-core bullet3 ccd console-bridge cppzmq cuda curl dlfcn-win32 eigen3 fcl ffmpeg freeimage gdal gflags glib gts jsoncpp libyaml libzip ogre ogre2 ogre22 openssl protobuf pybind11 qt5 qt5-winextras qwt spdlog sqlite3 tinyxml2 zeromq
+set VCPKG_DEPENDENCIES_LEGACY=assimp boost-core bullet3 ccd cli11 console-bridge cppzmq cuda curl dlfcn-win32 eigen3 fcl ffmpeg freeimage gdal gflags glib gts jsoncpp libyaml libzip ogre ogre2 ogre22 openssl protobuf pybind11 qt5 qt5-winextras qwt spdlog sqlite3 tinyxml2 zeromq
 
 goto :EOF

jenkins-scripts/lib/windows_env_vars.bat

@@ -401,12 +401,18 @@ goto :EOF
 :: ##################################
 :: 
 :: Create a pixi environment
-:pixi_create_gz_environment_legacy
-
+:pixi_create_gz_environment
+:: arg1: environment name inside conda/envs in this repo
+set ENV_NAME=%1
+set CONDA_ENV_PATH=%CONDA_ENVS_DIR%\%ENV_NAME%
+if not exist %CONDA_ENV_PATH% (
+  echo Can not find %CONDA_ENV_PATH% directory in the system
+  exit 1
+)
 if exist %PIXI_PROJECT_PATH% ( rmdir /s /q "%PIXI_PROJECT_PATH%")
 if errorlevel 1 exit 1
 mkdir %PIXI_PROJECT_PATH%
-copy %CONDA_ENVS_DIR%\legacy\pixi.* %PIXI_PROJECT_PATH%
+copy %CONDA_ENV_PATH%\pixi.* %PIXI_PROJECT_PATH%
 if errorlevel 1 exit 1
 pushd %PIXI_PROJECT_PATH%
 if errorlevel 1 exit 1