From 2c140dc04c0a37009979c354ce755babd0c4da32 Mon Sep 17 00:00:00 2001
From: Sebastian Castro <4603398+sea-bass@users.noreply.github.com>
Date: Sat, 11 Jan 2025 23:24:22 -0500
Subject: [PATCH 1/4] Remove source builds of `geometric_shapes` and `srdfdom`

---
 moveit2.repos | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/moveit2.repos b/moveit2.repos
index 6ce029c513..7426af03df 100644
--- a/moveit2.repos
+++ b/moveit2.repos
@@ -1,9 +1,5 @@
 repositories:
   # Keep moveit_* repos here because they are released with moveit
-  geometric_shapes:
-    type: git
-    url: https://github.com/moveit/geometric_shapes.git
-    version: ros2
   moveit_msgs:
     type: git
     url: https://github.com/moveit/moveit_msgs.git
@@ -12,7 +8,3 @@ repositories:
     type: git
     url: https://github.com/moveit/moveit_resources.git
     version: ros2
-  srdfdom:
-    type: git
-    url: https://github.com/moveit/srdfdom.git
-    version: ros2

From f400c00549f347b3cca8665db5d9de21259a5763 Mon Sep 17 00:00:00 2001
From: Sebastian Castro <4603398+sea-bass@users.noreply.github.com>
Date: Sun, 12 Jan 2025 00:06:50 -0500
Subject: [PATCH 2/4] Don't remove the binaries in CI anymore

---
 .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 ccb076d896..633984ed97 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -39,7 +39,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: apt remove -y ros-$ROS_DISTRO-geometric-shapes; vcs pull $BASEDIR/upstream_ws/src
+      AFTER_SETUP_UPSTREAM_WORKSPACE: 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 c25ff989ba2bebd486502c0f0f5b1f5c62a54d91 Mon Sep 17 00:00:00 2001
From: Sebastian Castro <4603398+sea-bass@users.noreply.github.com>
Date: Sun, 12 Jan 2025 07:32:21 -0500
Subject: [PATCH 3/4] Ignore another lcov error?

---
 .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 633984ed97..3349fe129a 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -163,7 +163,7 @@ jobs:
         with:
           docker: $DOCKER_IMAGE
           workdir: ${{ env.BASEDIR }}/target_ws
-          lcov_capture_args: --ignore-errors=gcov,gcov,mismatch,mismatch,negative,negative
+          lcov_capture_args: --ignore-errors=gcov,gcov,mismatch,mismatch,negative,negative,source,source
           ignore: '"*/target_ws/build/*" "*/target_ws/install/*" "*/test/*"'
       - name: Upload codecov report
         uses: codecov/codecov-action@v5

From bb12ff7f8953083c2fc532931607e78b1ee83e70 Mon Sep 17 00:00:00 2001
From: Sebastian Castro <4603398+sea-bass@users.noreply.github.com>
Date: Sun, 12 Jan 2025 07:50:03 -0500
Subject: [PATCH 4/4] Ignore lcov errors in sonar job also

---
 .github/workflows/sonar.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
index 777ed2c33e..261710df38 100644
--- a/.github/workflows/sonar.yaml
+++ b/.github/workflows/sonar.yaml
@@ -103,7 +103,7 @@ jobs:
         with:
           docker: $DOCKER_IMAGE
           workdir: ${{ env.BASEDIR }}/target_ws
-          lcov_capture_args: --ignore-errors=gcov,gcov,mismatch,mismatch,negative,negative
+          lcov_capture_args: --ignore-errors=gcov,gcov,mismatch,mismatch,negative,negative,source,source
           ignore: '"*/target_ws/build/*" "*/target_ws/install/*" "*/test/*"'
       - name: Install ccache
         run: sudo apt install ccache build-essential