Merge branch 'main' into enhancement/use-hpp-for-headers

moveit · Nov 17, 2024 · 4340e08 · 4340e08
2 parents 603ba86 + 91b47a6
commit 4340e08
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 13 deletions.
diff --git 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 \

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -26,10 +26,10 @@ jobs:
             CLANG_TIDY: pedantic
           - IMAGE: humble-ci
             ROS_DISTRO: humble
-          - IMAGE: humble-ci-testing
-            ROS_DISTRO: humble
           - IMAGE: jazzy-ci
             ROS_DISTRO: jazzy
+          - IMAGE: jazzy-ci-testing
+            ROS_DISTRO: jazzy
     env:
       # TODO(andyz): When this clang-tidy issue is fixed, remove -Wno-unknown-warning-option
       # https://stackoverflow.com/a/41673702

diff --git a/moveit2_humble.repos b/moveit2_humble.repos
diff --git a/moveit2_iron.repos b/moveit2_iron.repos