Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .docker/ci-testing/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RUN \
# Some basic requirements
wget git sudo curl \
# Preferred build tools
clang clang-format-14 clang-tidy clang-tools \
clang clang-format-18 clang-tidy clang-tools \
ccache \
ros-"$ROS_DISTRO"-ros-base && \
#
Expand Down Expand Up @@ -58,9 +58,9 @@ RUN \
if [ -r src/moveit2/moveit2_"$ROS_DISTRO".repos ] ; then vcs import src < src/moveit2/moveit2_"$ROS_DISTRO".repos ; fi && \
#
# Download all dependencies of MoveIt
rosdep update && \
DEBIAN_FRONTEND=noninteractive \
rosdep install -y --from-paths src --ignore-src --rosdistro "$ROS_DISTRO" --as-root=apt:false && \
rosdep update && \
# Remove the source code from this container
rm -rf src && \
#
Expand Down
2 changes: 1 addition & 1 deletion .docker/ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ RUN \
if [ -r src/moveit2/moveit2_${ROS_DISTRO}.repos ] ; then vcs import src < src/moveit2/moveit2_${ROS_DISTRO}.repos ; fi && \
#
# Download all dependencies of MoveIt
rosdep update && \
DEBIAN_FRONTEND=noninteractive \
rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false && \
rosdep update && \
# Remove the source code from this container
rm -rf src && \
#
Expand Down
4 changes: 2 additions & 2 deletions .docker/release/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ ENV RTI_NC_LICENSE_ACCEPTED=yes
# Commands are combined in single RUN statement with "apt/lists" folder removal to reduce image size
RUN apt-get update -q && \
apt-get upgrade -q -y && \
apt-get install -y "ros-${ROS_DISTRO}-moveit-*" --no-install-recommends && \
rm -rf /var/lib/apt/lists/*
apt-get install -y ros-rolling-moveit --no-install-recommends && \
rm -Rf /var/lib/apt/lists/*
2 changes: 1 addition & 1 deletion .docker/source/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ RUN --mount=type=cache,target=/root/.ccache/ \
. "/opt/ros/${ROS_DISTRO}/setup.sh" &&\
# Install dependencies from rosdep
apt-get -q update && \
rosdep update && \
DEBIAN_FRONTEND=noninteractive \
rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false && \
rosdep update && \
rm -rf /var/lib/apt/lists/* && \
# Build the workspace
colcon build \
Expand Down
2 changes: 1 addition & 1 deletion .docker/tutorial-source/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ RUN --mount=type=cache,target=/root/.ccache/,sharing=locked \
. "/opt/ros/${ROS_DISTRO}/setup.sh" &&\
# Install dependencies from rosdep
apt-get -q update && \
rosdep update && \
DEBIAN_FRONTEND=noninteractive \
rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false && \
rosdep update && \
rm -rf /var/lib/apt/lists/* && \
# Build the workspace
colcon build \
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/format.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ on:
jobs:
pre-commit:
name: Format
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v7
- uses: actions/setup-python@v7
with:
python-version: 3.x
- name: Install clang-format-14
run: sudo apt-get install clang-format-14
- name: Install clang-format-18
run: sudo apt-get install clang-format-18
- uses: pre-commit/action@v3.0.1
id: precommit
- name: Upload pre-commit changes
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
repos:
# Standard hooks
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
rev: v6.0.0
hooks:
- id: check-added-large-files
- id: check-case-conflict
Expand All @@ -33,18 +33,18 @@ repos:
- id: trailing-whitespace

- repo: https://github.com/psf/black
rev: 25.1.0
rev: 25.12.0
hooks:
- id: black

- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v14.0.6
rev: v18.1.8
hooks:
- id: clang-format
types_or: [c++, c, cuda]
args: ["-fallback-style=none"]
- repo: https://github.com/codespell-project/codespell
rev: v2.4.1
rev: v2.4.2
hooks:
- id: codespell
args: ['--write-changes', '--ignore-words=.codespell_words', '--skip="*.eps"']
Expand Down
Loading