From efa223ca2e4eb2da276a5b959f2ed75e4d1619ab Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Fri, 3 Jan 2025 13:10:48 +1000 Subject: [PATCH] Fixes --- additional_recipes/ros-noetic-eigenpy/recipe.yaml | 2 +- additional_recipes/ros-noetic-hpp-fcl/recipe.yaml | 2 +- additional_recipes/ros-noetic-jackal-base/recipe.yaml | 2 +- additional_recipes/ros-noetic-jackal-control/recipe.yaml | 2 +- .../ros-noetic-jackal-description/recipe.yaml | 2 +- additional_recipes/ros-noetic-jackal-desktop/recipe.yaml | 2 +- additional_recipes/ros-noetic-jackal-gazebo/recipe.yaml | 2 +- additional_recipes/ros-noetic-jackal-msgs/recipe.yaml | 2 +- .../ros-noetic-jackal-navigation/recipe.yaml | 2 +- .../ros-noetic-jackal-simulator/recipe.yaml | 2 +- additional_recipes/ros-noetic-jackal-viz/recipe.yaml | 2 +- additional_recipes/ros-noetic-pinocchio/recipe.yaml | 2 +- pixi.toml | 8 ++++---- vinca_linux_64.yaml | 1 - vinca_osx.yaml | 1 - 15 files changed, 16 insertions(+), 18 deletions(-) diff --git a/additional_recipes/ros-noetic-eigenpy/recipe.yaml b/additional_recipes/ros-noetic-eigenpy/recipe.yaml index 5f097a925..debc2360f 100644 --- a/additional_recipes/ros-noetic-eigenpy/recipe.yaml +++ b/additional_recipes/ros-noetic-eigenpy/recipe.yaml @@ -3,7 +3,7 @@ package: version: "3.10.1" build: - number: 0 + number: 21 requirements: run: diff --git a/additional_recipes/ros-noetic-hpp-fcl/recipe.yaml b/additional_recipes/ros-noetic-hpp-fcl/recipe.yaml index bae5c9bd8..6c53c2be6 100644 --- a/additional_recipes/ros-noetic-hpp-fcl/recipe.yaml +++ b/additional_recipes/ros-noetic-hpp-fcl/recipe.yaml @@ -3,7 +3,7 @@ package: version: "3.0.0" build: - number: 0 + number: 21 requirements: run: diff --git a/additional_recipes/ros-noetic-jackal-base/recipe.yaml b/additional_recipes/ros-noetic-jackal-base/recipe.yaml index e0bca2690..e0919c187 100644 --- a/additional_recipes/ros-noetic-jackal-base/recipe.yaml +++ b/additional_recipes/ros-noetic-jackal-base/recipe.yaml @@ -10,7 +10,7 @@ extra: recipe-maintainers: - robostack build: - number: 4 + number: 21 script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\bld_catkin.bat' }} diff --git a/additional_recipes/ros-noetic-jackal-control/recipe.yaml b/additional_recipes/ros-noetic-jackal-control/recipe.yaml index 262cb5469..ffe3dc7d1 100644 --- a/additional_recipes/ros-noetic-jackal-control/recipe.yaml +++ b/additional_recipes/ros-noetic-jackal-control/recipe.yaml @@ -10,7 +10,7 @@ extra: recipe-maintainers: - robostack build: - number: 4 + number: 21 script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\bld_catkin.bat' }} diff --git a/additional_recipes/ros-noetic-jackal-description/recipe.yaml b/additional_recipes/ros-noetic-jackal-description/recipe.yaml index 3e58f18fa..8bafb0212 100644 --- a/additional_recipes/ros-noetic-jackal-description/recipe.yaml +++ b/additional_recipes/ros-noetic-jackal-description/recipe.yaml @@ -10,7 +10,7 @@ extra: recipe-maintainers: - robostack build: - number: 4 + number: 21 script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\bld_catkin.bat' }} source: diff --git a/additional_recipes/ros-noetic-jackal-desktop/recipe.yaml b/additional_recipes/ros-noetic-jackal-desktop/recipe.yaml index e0341cb89..8e72f6005 100644 --- a/additional_recipes/ros-noetic-jackal-desktop/recipe.yaml +++ b/additional_recipes/ros-noetic-jackal-desktop/recipe.yaml @@ -10,7 +10,7 @@ extra: recipe-maintainers: - robostack build: - number: 4 + number: 21 script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\bld_catkin.bat' }} diff --git a/additional_recipes/ros-noetic-jackal-gazebo/recipe.yaml b/additional_recipes/ros-noetic-jackal-gazebo/recipe.yaml index 37b4ac23d..03e022701 100644 --- a/additional_recipes/ros-noetic-jackal-gazebo/recipe.yaml +++ b/additional_recipes/ros-noetic-jackal-gazebo/recipe.yaml @@ -10,7 +10,7 @@ extra: recipe-maintainers: - robostack build: - number: 4 + number: 21 script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\bld_catkin.bat' }} source: diff --git a/additional_recipes/ros-noetic-jackal-msgs/recipe.yaml b/additional_recipes/ros-noetic-jackal-msgs/recipe.yaml index 72a51d305..243990a97 100644 --- a/additional_recipes/ros-noetic-jackal-msgs/recipe.yaml +++ b/additional_recipes/ros-noetic-jackal-msgs/recipe.yaml @@ -10,7 +10,7 @@ extra: recipe-maintainers: - robostack build: - number: 4 + number: 21 script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\bld_catkin.bat' }} diff --git a/additional_recipes/ros-noetic-jackal-navigation/recipe.yaml b/additional_recipes/ros-noetic-jackal-navigation/recipe.yaml index b37425538..84626f24e 100644 --- a/additional_recipes/ros-noetic-jackal-navigation/recipe.yaml +++ b/additional_recipes/ros-noetic-jackal-navigation/recipe.yaml @@ -10,7 +10,7 @@ extra: recipe-maintainers: - robostack build: - number: 4 + number: 21 script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\bld_catkin.bat' }} diff --git a/additional_recipes/ros-noetic-jackal-simulator/recipe.yaml b/additional_recipes/ros-noetic-jackal-simulator/recipe.yaml index 626b400c9..78d95e3a2 100644 --- a/additional_recipes/ros-noetic-jackal-simulator/recipe.yaml +++ b/additional_recipes/ros-noetic-jackal-simulator/recipe.yaml @@ -10,7 +10,7 @@ extra: recipe-maintainers: - robostack build: - number: 4 + number: 21 script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\bld_catkin.bat' }} source: diff --git a/additional_recipes/ros-noetic-jackal-viz/recipe.yaml b/additional_recipes/ros-noetic-jackal-viz/recipe.yaml index 818ec1be7..15b4caf51 100644 --- a/additional_recipes/ros-noetic-jackal-viz/recipe.yaml +++ b/additional_recipes/ros-noetic-jackal-viz/recipe.yaml @@ -10,7 +10,7 @@ extra: recipe-maintainers: - robostack build: - number: 4 + number: 21 script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\bld_catkin.bat' }} diff --git a/additional_recipes/ros-noetic-pinocchio/recipe.yaml b/additional_recipes/ros-noetic-pinocchio/recipe.yaml index 8c5bc94e0..a34e40919 100644 --- a/additional_recipes/ros-noetic-pinocchio/recipe.yaml +++ b/additional_recipes/ros-noetic-pinocchio/recipe.yaml @@ -3,7 +3,7 @@ package: version: "3.3.1" build: - number: 0 + number: 21 requirements: run: diff --git a/pixi.toml b/pixi.toml index 78754d091..1ae0132ef 100644 --- a/pixi.toml +++ b/pixi.toml @@ -43,16 +43,16 @@ build_one_package = { cmd = "cp ./patch/$PACKAGE.*patch ./recipes/$PACKAGE/patch beta = ["beta"] [target.linux-64.tasks] -rename-file = { cmd = "cp vinca_linux_64.yaml vinca.yaml", depends_on = ["remove-file"] } +rename-file = { cmd = "ln -s vinca_linux_64.yaml vinca.yaml", depends_on = ["remove-file"] } [target.osx-64.tasks] -rename-file = { cmd = "cp vinca_osx.yaml vinca.yaml", depends_on = ["remove-file"] } +rename-file = { cmd = "ln -s vinca_osx.yaml vinca.yaml", depends_on = ["remove-file"] } [target.osx-arm64.tasks] rename-file = { cmd = "ln -s vinca_osx_arm64.yaml vinca.yaml", depends_on = ["remove-file"] } [target.linux-aarch64.tasks] -rename-file = { cmd = "cp vinca_linux_aarch64.yaml vinca.yaml", depends_on = ["remove-file"] } +rename-file = { cmd = "ln -s vinca_linux_aarch64.yaml vinca.yaml", depends_on = ["remove-file"] } [target.win-64.tasks] -rename-file = { cmd = "cp vinca_win.yaml vinca.yaml", depends_on = ["remove-file"] } +rename-file = { cmd = "ln -s vinca_win.yaml vinca.yaml", depends_on = ["remove-file"] } diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml index dde34fce1..deefe515e 100644 --- a/vinca_linux_64.yaml +++ b/vinca_linux_64.yaml @@ -202,7 +202,6 @@ packages_select_by_deps: - panda-moveit-config - moveit-ros-visualization - moveit-ros-planning-interface - - niryo_one_simulation - teb-local-planner - turtlebot3 - turtlebot3-fake diff --git a/vinca_osx.yaml b/vinca_osx.yaml index c2a1526d2..89c8f74fd 100644 --- a/vinca_osx.yaml +++ b/vinca_osx.yaml @@ -154,7 +154,6 @@ packages_select_by_deps: - panda-moveit-config - moveit-ros-visualization - moveit-ros-planning-interface - - niryo_one_simulation - turtlebot3 - turtlebot3-fake - librealsense2