More pkgs (#444)

* No naoqi * osx-arm64 on M1 runner * No franka * No more hector-gazebo-plugins
RoboStack · Feb 9, 2024 · b9f5e56 · b9f5e56
1 parent 6fb2891
commit b9f5e56
Show file tree

Hide file tree

Showing 5 changed files with 173 additions and 163 deletions.
diff --git a/.github/workflows/testpr.yml b/.github/workflows/testpr.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-2019]
+        os: [ubuntu-latest, macos-latest, macos-14, windows-2019]
         platform: [linux-64, linux-aarch64, osx-64, win-64, osx-arm64]
         exclude:
           - os: ubuntu-latest
@@ -21,10 +21,20 @@ jobs:
             platform: osx-64
           - os: ubuntu-latest
             platform: osx-arm64
+          - os: macos-14
+            platform: linux-64
+          - os: macos-14
+            platform: linux-aarch64
+          - os: macos-14
+            platform: osx-64
+          - os: macos-14
+            platform: win-64
           - os: macos-latest
             platform: linux-64
           - os: macos-latest
             platform: linux-aarch64
+          - os: macos-latest
+            platform: osx-arm64
           - os: macos-latest
             platform: win-64
           - os: windows-2019
@@ -67,7 +77,7 @@ jobs:
         conda info
         conda config --show
         micromamba install -y pip rospkg networkx "catkin_pkg>=0.4.16" "ruamel.yaml>=0.16.6" "rosdistro>=0.8.0" "empy>=3.3.4" boa
-    - name: install vinca and boa master
+    - name: install vinca
       shell: bash -l {0}
       run: |
         # use no-deps for now, otherwise problems with ruamel.
@@ -97,7 +107,7 @@ jobs:
         echo "::set-output name=OSX_ARM_YAML_CHANGED::${?}"
         git diff --exit-code --name-only origin/main -- vinca_win.yaml > /dev/null
         echo "::set-output name=WIN_YAML_CHANGED::${?}"
-    - name: Generate recipes for Linux
+    - name: Generate recipes for linux-64
       shell: bash -l {0}
       if: steps.filecheck.outputs.LINUX_YAML_CHANGED == 1 && matrix.os == 'ubuntu-latest' && matrix.platform == 'linux-64'
       run: |
@@ -106,7 +116,7 @@ jobs:
         vinca --platform linux-64
         ls
         cat recipe.yaml
-    - name: Generate recipes for Linux-ARM64
+    - name: Generate recipes for linux-aarch64
       shell: bash -l {0}
       if: steps.filecheck.outputs.LINUX_AARCH_YAML_CHANGED == 1 && matrix.os == 'ubuntu-latest' && matrix.platform == 'linux-aarch64'
       run: |
@@ -115,7 +125,7 @@ jobs:
         vinca --platform linux-aarch64
         ls
         cat recipe.yaml
-    - name: Generate recipes for macOS
+    - name: Generate recipes for osx-64
       shell: bash -l {0}
       if: steps.filecheck.outputs.OSX_YAML_CHANGED == 1 && matrix.os == 'macos-latest' && matrix.platform == 'osx-64'
       run: |
@@ -124,16 +134,16 @@ jobs:
         vinca --platform osx-64
         ls
         cat recipe.yaml
-    - name: Generate recipes for macOS-ARM64
+    - name: Generate recipes for osx-arm64
       shell: bash -l {0}
-      if: steps.filecheck.outputs.OSX_ARM_YAML_CHANGED == 1 && matrix.os == 'macos-latest' && matrix.platform == 'osx-arm64'
+      if: steps.filecheck.outputs.OSX_ARM_YAML_CHANGED == 1 && matrix.os == 'macos-14' && matrix.platform == 'osx-arm64'
       run: |
         git clean -fdx
         cp vinca_osx_arm64.yaml vinca.yaml
         vinca --platform osx-arm64
         ls
         cat recipe.yaml
-    - name: Generate recipes for Windows
+    - name: Generate recipes for win-64
       shell: bash -l {0}
       if: steps.filecheck.outputs.WIN_YAML_CHANGED == 1 && matrix.os == 'windows-2019' && matrix.platform == 'win-64'
       run: |
@@ -150,31 +160,31 @@ jobs:
         set +e
         grep -q "outputs: \[\]" recipe.yaml > /dev/null
         echo "::set-output name=RECIPE_CREATED::${?}"
-    - name: Build recipes for Linux
+    - name: Build recipes for linux-64
       shell: bash -l {0}
       run: |
         boa build additional_recipes/ros-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
       if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.LINUX_YAML_CHANGED == 1 && matrix.os == 'ubuntu-latest' && matrix.platform == 'linux-64'
-    - name: Build recipes for Linux-ARM64
+    - name: Build recipes for linux-aarch64
       shell: bash -l {0}
       if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.LINUX_AARCH_YAML_CHANGED == 1 && matrix.os == 'ubuntu-latest' && matrix.platform == 'linux-aarch64'
       run: |
         boa build additional_recipes/ros-distro-mutex/ -m ./.ci_support/conda_forge_pinnings.yaml -m ./conda_build_config.yaml --target-platform=linux-aarch64
         boa build . -m ./.ci_support/conda_forge_pinnings.yaml -m ./conda_build_config.yaml --target-platform=linux-aarch64
-    - name: Build recipes for macOS
+    - name: Build recipes for osx-64
       shell: bash -l {0}
       if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.OSX_YAML_CHANGED == 1 && matrix.os == 'macos-latest' && matrix.platform == 'osx-64'
       run: |
         boa build additional_recipes/ros-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
-    - name: Build recipes for macOS-ARM64
+    - name: Build recipes for osx-arm64
       shell: bash -l {0}
-      if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.OSX_ARM_YAML_CHANGED == 1 && matrix.os == 'macos-latest' && matrix.platform == 'osx-arm64'
+      if: steps.newrecipecheck.outputs.RECIPE_CREATED == 1 && steps.filecheck.outputs.OSX_ARM_YAML_CHANGED == 1 && matrix.os == 'macos-14' && matrix.platform == 'osx-arm64'
       run: |
         boa build additional_recipes/ros-distro-mutex/ -m ./.ci_support/conda_forge_pinnings.yaml -m ./conda_build_config.yaml --target-platform=osx-arm64
-        boa build . -m ./.ci_support/conda_forge_pinnings.yaml -m ./conda_build_config.yaml --target-platform=osx-arm64
-    - name: Build recipes for Windows
+        boa build . -m ./.ci_support/conda_forge_pinnings.yaml -m ./conda_build_config.yaml
+    - name: Build recipes for win-64
       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: |

diff --git a/vinca_linux_64.yaml b/vinca_linux_64.yaml
@@ -182,6 +182,50 @@ packages_select_by_deps:
   - joy
   - nmea-msgs
 
+  - gazebo-ros-control
+  - gazebo-plugins
+  - lms1xx
+  - controller-manager
+  - interactive_marker_twist_server
+  - diff-drive-controller
+  - joint-state-controller
+  - robot-localization
+  - teleop-twist-joy
+  - twist-mux
+  - pointgrey-camera-description
+  - geometry-msgs
+  - nmea-navsat-driver
+  - rosserial-server
+  - imu-filter-madgwick
+  - rosserial-python
+  - tf2_web_republisher
+  - combined-robot-hw
+  - panda-moveit-config
+  - moveit-ros-visualization
+  - moveit-ros-planning-interface
+  - niryo_one_simulation
+  - teb-local-planner
+  - turtlebot3
+  - turtlebot3-fake
+  - librealsense2
+  - realsense2_camera
+  - ur-msgs
+  - rosdoc-lite
+  - ros_numpy
+  - velodyne-description
+  - velodyne-simulator
+  - effort-controllers
+  - velocity-controllers
+  - turtlebot3-teleop
+  - turtlebot3-simulations
+  - slam-toolbox
+  - urg_node
+  - urg_c
+  - laser_proc
+  - audio-common-msgs
+  - sound-play
+  - pid
+
   # Needs fixing in CI, uploaded manually
   - rtabmap
   - rtabmap-ros
@@ -190,23 +234,7 @@ packages_select_by_deps:
   # - rosfmt  # see https://github.com/xqms/rosfmt/issues/12
   # - rosmon  # because of https://github.com/xqms/rosfmt/issues/12
 
-  # - gazebo-ros-control
-  # - gazebo-plugins
-  # - lms1xx
-  # - controller-manager
-  # - interactive_marker_twist_server
-  # - diff-drive-controller
-  # - joint-state-controller
-  # - robot-localization
-  # - teleop-twist-joy
-  # - twist-mux
-  # - pointgrey-camera-description
-  # - geometry-msgs
-  # - nmea-navsat-driver
-  # - rosserial-server
-  # - imu-filter-madgwick
-  # - rosserial-python
-  # - tf2_web_republisher
+  # Not compatible with recent libabsl
   # - libfranka
   # - franka
   # - franka-gripper
@@ -216,37 +244,12 @@ packages_select_by_deps:
   # - franka-control
   # - franka_example_controllers
   # - franka_ros
-  # - combined-robot-hw
-  # - panda-moveit-config
-  # - moveit-ros-visualization
-  # - moveit-ros-planning-interface
-  # - niryo_one_simulation
-  # - teb-local-planner
-  # - turtlebot3
-  # - turtlebot3-fake
-  # - librealsense2
-  # - realsense2_camera
-  # - ur-msgs
-  # - rosdoc-lite
-  # - ros_numpy
-  # - velodyne-description
-  # - velodyne-simulator
-  # - effort-controllers
-  # - velocity-controllers
-  # - turtlebot3-teleop
-  # - turtlebot3-simulations
-  # - slam-toolbox
-  # - urg_node
-  # - urg_c
-  # - laser_proc
+
+  # Not compatible with recent boost
   # - naoqi-bridge-msgs
   # - naoqi-driver
   # - naoqi-libqi
   # - naoqi-libqicore
-  # - audio-common-msgs
-  # - sound-play
-  # - pid
-
 
   ## PREVIOUSLY SUPPORTED PACKAGES, NOW NOT PACKAGED ANYMORE UNTIL REQUESTED
   ## TODO AFTER REBUILD

diff --git a/vinca_osx.yaml b/vinca_osx.yaml
@@ -120,54 +120,52 @@ packages_select_by_deps:
   - turtlebot3-simulations
   - teb-local-planner
 
-
-  # # # # For jackal
-  # - gazebo-dev
-  # - gazebo-ros
-  # - hector-gazebo-plugins
-  # - gazebo-ros-control
-  # - gazebo-plugins
-  # - lms1xx
-  # - controller-manager
-  # - interactive_marker_twist_server
-  # - diff-drive-controller
-  # - joint-state-controller
-  # - joy
-  # - robot-localization
-  # - teleop-twist-joy
-  # - twist-mux
-  # - pointgrey-camera-description
-  # - nmea-msgs
-  # - geometry-msgs
-  # - nmea-navsat-driver
-  # - rosserial-server
-  # - imu-filter-madgwick
-  # - rosserial-python
-  # - tf2_web_republisher
-  # - libfranka
-  # - franka
-  # - franka-gripper
-  # - franka-hw
-  # - franka-msgs
-  # - franka-description
-  # - franka-control
-  # - franka_example_controllers
-  # - franka_ros
-  # - combined-robot-hw
-  # - panda-moveit-config
-  # - moveit-ros-visualization
-  # - moveit-ros-planning-interface
-  # - niryo_one_simulation
-  # - turtlebot3
-  # - turtlebot3-fake
-  # - librealsense2
-  # - realsense2_camera
-  # - ur-msgs
-  # - rosdoc-lite
-  # - ros_numpy
+  - gazebo-dev
+  - gazebo-ros
+  - hector-gazebo-plugins
+  - gazebo-ros-control
+  - gazebo-plugins
+  - lms1xx
+  - controller-manager
+  - interactive_marker_twist_server
+  - diff-drive-controller
+  - joint-state-controller
+  - joy
+  - robot-localization
+  - teleop-twist-joy
+  - twist-mux
+  - pointgrey-camera-description
+  - nmea-msgs
+  - geometry-msgs
+  - nmea-navsat-driver
+  - rosserial-server
+  - imu-filter-madgwick
+  - rosserial-python
+  - tf2_web_republisher
+  - libfranka
+  - franka
+  - franka-gripper
+  - franka-hw
+  - franka-msgs
+  - franka-description
+  - franka-control
+  - franka_example_controllers
+  - franka_ros
+  - combined-robot-hw
+  - panda-moveit-config
+  - moveit-ros-visualization
+  - moveit-ros-planning-interface
+  - niryo_one_simulation
+  - turtlebot3
+  - turtlebot3-fake
+  - librealsense2
+  - realsense2_camera
+  - ur-msgs
+  - rosdoc-lite
+  - ros_numpy
 
-  # - sound-play
-  # - pid
+  - sound-play
+  - pid
 
   ## PREVIOUSLY SUPPORTED PACKAGES, NOW NOT PACKAGED ANYMORE UNTIL REQUESTED
   ##