Skip to content
Merged
Show file tree
Hide file tree
Changes from 15 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
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ _commands:
- restore_cache:
name: Restore Cache << parameters.key >>
keys:
- "<< parameters.key >>-v31\
- "<< parameters.key >>-v32\
-{{ arch }}\
-{{ .Branch }}\
-{{ .Environment.CIRCLE_PR_NUMBER }}\
-{{ checksum \"<< parameters.workspace >>/lockfile.txt\" }}"
- "<< parameters.key >>-v31\
- "<< parameters.key >>-v32\
-{{ arch }}\
-main\
-<no value>\
Expand All @@ -58,7 +58,7 @@ _commands:
steps:
- save_cache:
name: Save Cache << parameters.key >>
key: "<< parameters.key >>-v31\
key: "<< parameters.key >>-v32\
-{{ arch }}\
-{{ .Branch }}\
-{{ .Environment.CIRCLE_PR_NUMBER }}\
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/caddy/srv/assets/foxglove/nav2_layout.json
Original file line number Diff line number Diff line change
Expand Up @@ -460,4 +460,4 @@
"direction": "row",
"splitPercentage": 74.87855655794587
}
}
}
2 changes: 1 addition & 1 deletion .devcontainer/caddy/srv/nav2/github-markdown.css
Original file line number Diff line number Diff line change
Expand Up @@ -1099,4 +1099,4 @@

.markdown-body ::-webkit-calendar-picker-indicator {
filter: invert(50%);
}
}
4 changes: 2 additions & 2 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pull_request_rules:
backport:
branches:
- jazzy

- name: backport to iron at reviewers discretion
conditions:
- base=main
Expand All @@ -16,7 +16,7 @@ pull_request_rules:
backport:
branches:
- iron

- name: backport to humble at reviewers discretion
conditions:
- base=main
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Codespell
on:
pull_request:

jobs:
codespell:
name: Run codespell
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install codespell
run: pip install codespell
- name: Run codespell
run: codespell --toml ./tools/pyproject.toml
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,3 @@ Session.vim

# Vim Temporary
.netrwhist

97 changes: 97 additions & 0 deletions .pre-commit-config.yaml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • I love myself a python import sorter: https://github.com/PyCQA/isort (idk if there is one for C++ as well). What do you think of adding?
  • I ran it locally and the end-of-file-fixer still fixes nav2_costmap_2d/test/integration/CMakeLists.txt and .gitignore for me. Doesn't it for you?
  • ament_flake8 also complains about files under the folder tools - I guess it is skipped in the CI so maybe also skip this folder with pre-commit?

Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@

# To use:
#
# pre-commit run -a
#
# Or:
#
# pre-commit install # (runs every time you commit in git)
#
# To update this file:
#
# pre-commit autoupdate
#
# See https://github.com/pre-commit/pre-commit
exclude: ".pgm$|.svg$"
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
hooks:
- id: check-added-large-files
- id: check-ast
- id: check-case-conflict
- id: check-merge-conflict
- id: check-symlinks
- id: check-xml
- id: check-yaml
args: ["--allow-multiple-documents"]
- id: debug-statements
- id: end-of-file-fixer
- id: forbid-submodules
- id: mixed-line-ending
- id: trailing-whitespace
exclude_types: [rst]
- id: fix-byte-order-marker
- repo: https://github.com/pycqa/isort
rev: 6.0.1
hooks:
- id: isort
args: ["tools/pyproject.toml"]
name: isort (python)

- repo: https://github.com/codespell-project/codespell
rev: v2.4.1
hooks:
- id: codespell
additional_dependencies:
- tomli
args:
[--toml=./tools/pyproject.toml]
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.31.1
hooks:
- id: check-github-workflows
args: ["--verbose"]
- id: check-github-actions
args: ["--verbose"]
- id: check-dependabot
args: ["--verbose"]
- repo: local
hooks:
- id: ament_lint_cmake
name: ament_lint_cmake
description: Check CMake code style using cmakelint.
language: system
types: [cmake]
entry: ament_lint_cmake
- id: ament_cpplint
name: ament_cpplint
description: Code style checking using cpplint.
language: system
types: [c++]
entry: ament_cpplint
- id: ament_uncrustify
name: ament_uncrustify
description: Code style checking using uncrustify.
language: system
types: [c++]
args: ["--reformat"]
entry: ament_uncrustify
- id: ament_xmllint
name: ament_xmllint
description: Check XML markup using xmllint.
language: system
types: [xml]
entry: ament_xmllint
- id: ament_flake8
name: ament_flake8
description: Check Python code style using flake8.
language: system
types: [python]
entry: ament_flake8
- id: ament_pep257
name: ament_pep257
description: Check Python code style using pep257.
language: system
types: [python]
entry: ament_pep257
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ RUN mkdir -p $ROOT_SRV

# install demo dependencies
RUN apt-get update && apt-get install -y \
ros-$ROS_DISTRO-rviz2
ros-$ROS_DISTRO-rviz2

# install gzweb dependacies
RUN apt-get install -y --no-install-recommends \
Expand Down
Loading
Loading