From c64ee59d61d293f6c2ec6bff83c4135f36ceda5e Mon Sep 17 00:00:00 2001 From: sea-bass Date: Sat, 23 Nov 2024 10:24:47 -0500 Subject: [PATCH 1/4] Restore --with-new-pkgs arg in CI Dockerfile --- .docker/ci/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/ci/Dockerfile b/.docker/ci/Dockerfile index 2492da642f..827bae17d9 100644 --- a/.docker/ci/Dockerfile +++ b/.docker/ci/Dockerfile @@ -18,7 +18,7 @@ COPY . src/moveit2 RUN \ # Update apt package list as previous containers clear the cache apt-get -q update && \ - apt-get -q -y upgrade && \ + apt-get -q -y upgrade --with-new-pkgs && \ # # Install some base dependencies apt-get -q install --no-install-recommends -y \ From 59f6e435d5eacfe12a37710276bb69c46971090c Mon Sep 17 00:00:00 2001 From: sea-bass Date: Mon, 25 Nov 2024 19:51:15 -0500 Subject: [PATCH 2/4] Pin version of geometric_shapes repo --- moveit2.repos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moveit2.repos b/moveit2.repos index 6ce029c513..9a36034621 100644 --- a/moveit2.repos +++ b/moveit2.repos @@ -3,7 +3,7 @@ repositories: geometric_shapes: type: git url: https://github.com/moveit/geometric_shapes.git - version: ros2 + version: 4f65a38 # TODO: Fix the issues introduced in https://github.com/moveit/geometric_shapes/pull/239 moveit_msgs: type: git url: https://github.com/moveit/moveit_msgs.git From 0f006eff432c588ca6330d078a2611634b54ef53 Mon Sep 17 00:00:00 2001 From: Sebastian Castro <4603398+sea-bass@users.noreply.github.com> Date: Mon, 25 Nov 2024 20:01:37 -0500 Subject: [PATCH 3/4] Update .docker/ci/Dockerfile --- .docker/ci/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/ci/Dockerfile b/.docker/ci/Dockerfile index 827bae17d9..2492da642f 100644 --- a/.docker/ci/Dockerfile +++ b/.docker/ci/Dockerfile @@ -18,7 +18,7 @@ COPY . src/moveit2 RUN \ # Update apt package list as previous containers clear the cache apt-get -q update && \ - apt-get -q -y upgrade --with-new-pkgs && \ + apt-get -q -y upgrade && \ # # Install some base dependencies apt-get -q install --no-install-recommends -y \ From 4dcd678a1798f29902d959266f455fb1447eb1e5 Mon Sep 17 00:00:00 2001 From: sea-bass Date: Mon, 25 Nov 2024 20:18:47 -0500 Subject: [PATCH 4/4] Try reverting suspected change --- moveit2.repos | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/moveit2.repos b/moveit2.repos index 9a36034621..03026fa73a 100644 --- a/moveit2.repos +++ b/moveit2.repos @@ -3,7 +3,8 @@ repositories: geometric_shapes: type: git url: https://github.com/moveit/geometric_shapes.git - version: 4f65a38 # TODO: Fix the issues introduced in https://github.com/moveit/geometric_shapes/pull/239 + #version: 4f65a38 # TODO: Fix the issues introduced in https://github.com/moveit/geometric_shapes/pull/239 + version: revert-extend-with-transformed-box moveit_msgs: type: git url: https://github.com/moveit/moveit_msgs.git