Merge pull request #230 from PickNikRobotics/4.0.2-rc1

4.0.2 rc1
PickNikRobotics · Feb 29, 2024 · c7980e9 · c7980e9
2 parents 3226f3d + dca53a2
commit c7980e9
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 23 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -61,6 +61,19 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
       --from-paths src \
       --ignore-src
 
+# Set up colcon defaults for the new user
+USER ${USERNAME}
+RUN colcon mixin add default \
+    https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml && \
+    colcon mixin update && \
+    colcon metadata add default \
+    https://raw.githubusercontent.com/colcon/colcon-metadata-repository/master/index.yaml && \
+    colcon metadata update
+COPY colcon-defaults.yaml /home/${USERNAME}/.colcon/defaults.yaml
+
+# hadolint ignore=DL3002
+USER root
+
 ###################################################################
 # Target for the developer build which does not compile any code. #
 ###################################################################

diff --git a/colcon-defaults.yaml b/colcon-defaults.yaml
@@ -0,0 +1,17 @@
+# Contains colcon default settings for user overlay containers.
+build:
+  # Enable this for bidirectional syncing from the UI
+  symlink-install: true
+  mixin:
+    # Enable ccache support
+    - ccache
+    # Multithreaded linker to speed up linking step during compilation
+    - lld
+    - compile-commands
+    # Debug info and build testing for dev workflows
+    - rel-with-deb-info
+    - build-testing-on
+test:
+  event-handlers:
+    - console_direct+
+    - desktop_notification+
diff --git a/src/moveit_studio_ur_pstop_manager/package.xml b/src/moveit_studio_ur_pstop_manager/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>moveit_studio_ur_pstop_manager</name>
-  <version>4.0.1</version>
+  <version>4.0.2</version>
   <description>Provides a node to monitor the protective stop state of the UR5, and reset protective
     stops when necessary.</description>
   <maintainer email="support@picknik.ai">MoveIt Pro Maintainer</maintainer>

diff --git a/src/picknik_ur_base_config/objectives/teleoperate_joint_jog.xml b/src/picknik_ur_base_config/objectives/teleoperate_joint_jog.xml
diff --git a/src/picknik_ur_base_config/objectives/teleoperate_twist.xml b/src/picknik_ur_base_config/objectives/teleoperate_twist.xml
diff --git a/src/picknik_ur_base_config/package.xml b/src/picknik_ur_base_config/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>picknik_ur_base_config</name>
-  <version>4.0.1</version>
+  <version>4.0.2</version>
 
   <description>Base configuration package for Picknik's UR robot arms</description>
 

diff --git a/src/picknik_ur_gazebo_config/package.xml b/src/picknik_ur_gazebo_config/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>picknik_ur_gazebo_config</name>
-  <version>4.0.1</version>
+  <version>4.0.2</version>
 
   <description>Site configuration package for the UR5e in PickNik's space station world simulated by Gazebo.</description>
 

diff --git a/src/picknik_ur_gazebo_scan_and_plan_config/package.xml b/src/picknik_ur_gazebo_scan_and_plan_config/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>picknik_ur_gazebo_scan_and_plan_config</name>
-  <version>4.0.1</version>
+  <version>4.0.2</version>
 
   <description>Site configuration package for the UR5e simulated in Gazebo to show "scan and plan" applications.</description>
 

diff --git a/src/picknik_ur_mock_hw_config/package.xml b/src/picknik_ur_mock_hw_config/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>picknik_ur_mock_hw_config</name>
-  <version>4.0.1</version>
+  <version>4.0.2</version>
 
   <description>Configuration package for a UR arm that can be simulated with mock hardware</description>
 

diff --git a/src/picknik_ur_site_config/package.xml b/src/picknik_ur_site_config/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>picknik_ur_site_config</name>
-  <version>4.0.1</version>
+  <version>4.0.2</version>
 
   <description>Site configuration package for a UR arm that can be simulated with mock hardware</description>
 

diff --git a/src/picknik_ur_studio_integration_testing/package.xml b/src/picknik_ur_studio_integration_testing/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>picknik_ur_studio_integration_testing</name>
-  <version>4.0.1</version>
+  <version>4.0.2</version>
   <description>Integration tests for UR with MoveIt Pro.</description>
   <maintainer email="support@picknik.ai">MoveIt Pro Maintainer</maintainer>