From 05c1441f3134c58a0ba85e475a65ee926e14d92c Mon Sep 17 00:00:00 2001 From: Sebastian Castro <4603398+sea-bass@users.noreply.github.com> Date: Thu, 28 Nov 2024 08:52:46 -0500 Subject: [PATCH 1/5] Test fixes to `geometric_shapes` in CI --- moveit2.repos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moveit2.repos b/moveit2.repos index 6ce029c513..e51e2408c7 100644 --- a/moveit2.repos +++ b/moveit2.repos @@ -10,7 +10,7 @@ repositories: version: ros2 moveit_resources: type: git - url: https://github.com/moveit/moveit_resources.git + url: https://github.com/rhaschke/geometric_shapes.git version: ros2 srdfdom: type: git From 9b91dfa6b436d9dd10a16d128a1ef57788f37842 Mon Sep 17 00:00:00 2001 From: Sebastian Castro <4603398+sea-bass@users.noreply.github.com> Date: Thu, 28 Nov 2024 08:57:33 -0500 Subject: [PATCH 2/5] doing it correctly would help --- moveit2.repos | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/moveit2.repos b/moveit2.repos index e51e2408c7..abed3842a4 100644 --- a/moveit2.repos +++ b/moveit2.repos @@ -2,7 +2,7 @@ repositories: # Keep moveit_* repos here because they are released with moveit geometric_shapes: type: git - url: https://github.com/moveit/geometric_shapes.git + url: https://github.com/moveit/geometric_shapes/pull/253 version: ros2 moveit_msgs: type: git @@ -10,7 +10,7 @@ repositories: version: ros2 moveit_resources: type: git - url: https://github.com/rhaschke/geometric_shapes.git + url: https://github.com/moveit/moveit_resources.git version: ros2 srdfdom: type: git From 4586ac67da657541c8bf2f5e1bea8ccd6f5f779b Mon Sep 17 00:00:00 2001 From: Sebastian Castro <4603398+sea-bass@users.noreply.github.com> Date: Thu, 28 Nov 2024 08:58:02 -0500 Subject: [PATCH 3/5] Update moveit2.repos --- moveit2.repos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moveit2.repos b/moveit2.repos index abed3842a4..5ddefc9b2f 100644 --- a/moveit2.repos +++ b/moveit2.repos @@ -2,7 +2,7 @@ repositories: # Keep moveit_* repos here because they are released with moveit geometric_shapes: type: git - url: https://github.com/moveit/geometric_shapes/pull/253 + url: https://github.com/rhaschke/geometric_shapes.git version: ros2 moveit_msgs: type: git From 9d13bd2f88d3c693fecf105004ea1bc06f852810 Mon Sep 17 00:00:00 2001 From: Robert Haschke Date: Thu, 28 Nov 2024 17:28:16 +0100 Subject: [PATCH 4/5] TEMP: Remove geometric-shapes binary package --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f8e5385c8d..1e09cdf939 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -41,7 +41,7 @@ jobs: moveit2.repos $(f="moveit2_$(sed 's/-.*$//' <<< "${{ matrix.env.IMAGE }}").repos"; test -r $f && echo $f) # Pull any updates to the upstream workspace (after restoring it from cache) - AFTER_SETUP_UPSTREAM_WORKSPACE: vcs pull $BASEDIR/upstream_ws/src + AFTER_SETUP_UPSTREAM_WORKSPACE: apt remove -y ros-$ROS_DISTRO-geometric-shapes; vcs pull $BASEDIR/upstream_ws/src AFTER_SETUP_DOWNSTREAM_WORKSPACE: vcs pull $BASEDIR/downstream_ws/src # Clear the ccache stats before and log the stats after the build AFTER_SETUP_CCACHE: ccache --zero-stats --max-size=10.0G From b9f0ed8c6401875b67e414cf4291b5beab8799cb Mon Sep 17 00:00:00 2001 From: Robert Haschke Date: Thu, 28 Nov 2024 21:22:16 +0100 Subject: [PATCH 5/5] Revert change to moveit2.repos --- moveit2.repos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moveit2.repos b/moveit2.repos index 5ddefc9b2f..6ce029c513 100644 --- a/moveit2.repos +++ b/moveit2.repos @@ -2,7 +2,7 @@ repositories: # Keep moveit_* repos here because they are released with moveit geometric_shapes: type: git - url: https://github.com/rhaschke/geometric_shapes.git + url: https://github.com/moveit/geometric_shapes.git version: ros2 moveit_msgs: type: git