Merge pull request #155 from RoboStack/fix-moveit

Build moveit on Win; upstream repo has been fixed
RoboStack · Jul 2, 2024 · b4c3946 · b4c3946
2 parents 40de211 + 6bc5ae4
commit b4c3946
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.github/testpr_environment.yml b/.github/testpr_environment.yml
@@ -6,7 +6,7 @@ dependencies:
   - python 3.11.*
   - pip
   - boa
-  - conda-build <3.28
+  - conda-build
   - rospkg
   - catkin_pkg >=0.4.16
   - ruamel.yaml >=0.16.6,<0.18

diff --git a/.github/workflows/testpr.yml b/.github/workflows/testpr.yml
@@ -198,5 +198,6 @@ jobs:
       shell: bash -l {0}
       if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.WIN_YAML_CHANGED == 1 && matrix.os == 'windows-2019' && matrix.platform == 'win-64'
       run: |
+        echo "CONDA_BLD_PATH=C:\\bld\\" >> $GITHUB_ENV
         boa build additional_recipes/ros2-distro-mutex/ -m ./.ci_support/conda_forge_pinnings.yaml -m ./conda_build_config.yaml
         boa build . -m ./.ci_support/conda_forge_pinnings.yaml -m ./conda_build_config.yaml
diff --git a/vinca_win.yaml b/vinca_win.yaml
@@ -43,6 +43,7 @@ packages_select_by_deps:
   - ros_environment
   - ros_base
   - rmw_cyclonedds_cpp
+  - moveit
   - xacro
   - gazebo-ros
   # - navigation2
@@ -65,9 +66,6 @@ packages_select_by_deps:
   - ros2-controllers-test-nodes
   - joint-state-publisher-gui
 
-  # PREVIOUSLY SUPPORTED PACKAGES, CURRENTLY BROKEN
-  # Currently has upstream issues with git LFS
-  # - moveit
   # Broken for now until we migrate to newer gazebo
   # - desktop_full