Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update clang version 14->15 #3057

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion .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-15 clang-tidy clang-tools \
ccache \
ros-"$ROS_DISTRO"-ros-base && \
#
Expand Down
2 changes: 1 addition & 1 deletion .docker/ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

ARG ROS_DISTRO=rolling
FROM ros:${ROS_DISTRO}-ros-base
LABEL maintainer Robert Haschke [email protected]

Check warning on line 6 in .docker/ci/Dockerfile

View workflow job for this annotation

GitHub Actions / ci (rolling)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "LABEL key=value" should be used instead of legacy "LABEL key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 6 in .docker/ci/Dockerfile

View workflow job for this annotation

GitHub Actions / ci (jazzy)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "LABEL key=value" should be used instead of legacy "LABEL key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

ENV TERM xterm

Check warning on line 8 in .docker/ci/Dockerfile

View workflow job for this annotation

GitHub Actions / ci (rolling)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

Check warning on line 8 in .docker/ci/Dockerfile

View workflow job for this annotation

GitHub Actions / ci (jazzy)

Legacy key/value format with whitespace separator should not be used

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

# Setup (temporary) ROS workspace
WORKDIR /root/ws_moveit
Expand All @@ -15,7 +15,7 @@

# Commands are combined in single RUN statement with "apt/lists" folder removal to reduce image size
# https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#minimize-the-number-of-layers
RUN \

Check failure on line 18 in .docker/ci/Dockerfile

View workflow job for this annotation

GitHub Actions / Lint Dockerfiles (ci)

SC2086 info: Double quote to prevent globbing and word splitting.
# Update apt package list as previous containers clear the cache
apt-get -q update && \
apt-get -q -y upgrade --with-new-pkgs && \
Expand All @@ -25,7 +25,7 @@
# Some basic requirements
wget git sudo curl \
# Preferred build tools
clang clang-format-14 clang-tidy clang-tools \
clang clang-format-15 clang-tidy clang-tools \
ccache && \
#
# Globally disable git security
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/format.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
- uses: actions/setup-python@v5
with:
python-version: 3.x
- name: Install clang-format-14
run: sudo apt-get install clang-format-14
- name: Install clang-format-15
run: sudo apt-get install clang-format-15
- uses: pre-commit/[email protected]
id: precommit
- name: Upload pre-commit changes
Expand Down
6 changes: 3 additions & 3 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: v4.5.0
rev: v5.0.0
hooks:
- id: check-added-large-files
- id: check-case-conflict
Expand All @@ -33,7 +33,7 @@ repos:
- id: trailing-whitespace

- repo: https://github.com/psf/black
rev: 23.10.0
rev: 24.10.0
hooks:
- id: black

Expand All @@ -42,7 +42,7 @@ repos:
- id: clang-format
name: clang-format
description: Format files with ClangFormat.
entry: clang-format-14
entry: clang-format-15
language: system
files: \.(c|cc|cxx|cpp|frag|glsl|h|hpp|hxx|ih|ispc|ipp|java|js|m|proto|vert)$
args: ['-fallback-style=none', '-i']
Expand Down
6 changes: 3 additions & 3 deletions moveit/scripts/create_readme_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ def define_urls(target, params):
)
params["url"] = "{base_url}/view/{R}src_u{U}/job/{job}".format(**params)
elif target == "bin":
params[
"job"
] = "{R}bin_u{U}64__{package}__ubuntu_{ubuntu}_amd64__binary".format(**params)
params["job"] = (
"{R}bin_u{U}64__{package}__ubuntu_{ubuntu}_amd64__binary".format(**params)
)
params["url"] = "{base_url}/view/{R}bin_u{U}64/job/{job}".format(**params)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ def perform(self, context: LaunchContext) -> Text:
for key, value in self.__mappings.items():
normalized_key = normalize_to_list_of_substitutions(key)
normalized_value = normalize_to_list_of_substitutions(value)
expanded_mappings[
perform_substitutions(context, normalized_key)
] = perform_substitutions(context, normalized_value)
expanded_mappings[perform_substitutions(context, normalized_key)] = (
perform_substitutions(context, normalized_value)
)

return load_xacro(Path(expanded_file_path), mappings=expanded_mappings)
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ void point_containment_filter::ShapeMask::maskContainment(const sensor_msgs::msg

// Cloud iterators are not incremented in the for loop, because of the pragma
// Comment out below parallelization as it can result in very high CPU consumption
//#pragma omp parallel for schedule(dynamic)
// #pragma omp parallel for schedule(dynamic)
for (int i = 0; i < static_cast<int>(np); ++i)
{
Eigen::Vector3d pt = Eigen::Vector3d(*(iter_x + i), *(iter_y + i), *(iter_z + i));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
#include <geometry_msgs/msg/pose_stamped.hpp>
#include <moveit/macros/class_forward.h>
#include <moveit/robot_interaction/locked_robot_state.h>
//#include <moveit/robot_interaction/robot_interaction.h>
#include <visualization_msgs/msg/interactive_marker_feedback.hpp>
#include <interactive_markers/menu_handler.hpp>
#include <tf2_ros/buffer.h>
Expand Down
Loading