Skip to content

Commit

Permalink
Merge branch 'main' into fix/docker-local-build
Browse files Browse the repository at this point in the history
  • Loading branch information
amadeuszsz authored Dec 19, 2024
2 parents b698585 + 8f750f4 commit a571d3d
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 17 deletions.
22 changes: 22 additions & 0 deletions .devcontainer/core-devel/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"name": "autoware:core-devel",
"build": {
"dockerfile": "../Dockerfile",
"args": { "BASE_IMAGE": "ghcr.io/autowarefoundation/autoware:core-devel" }
},
"remoteUser": "autoware",
"runArgs": [
"--cap-add=SYS_PTRACE",
"--security-opt",
"seccomp=unconfined",
"--net=host",
"--volume=/etc/localtime:/etc/localtime:ro"
],
"customizations": {
"vscode": {
"settings.json": {
"terminal.integrated.profiles.linux": { "bash": { "path": "/bin/bash" } }
}
}
}
}
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
* [email protected] mfc@leodrive.ai
* [email protected] mfc@autoware.org

.devcontainer/** [email protected] [email protected]
.github/** [email protected] [email protected]
Expand Down
3 changes: 2 additions & 1 deletion .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ version: 2
updates:
- package-ecosystem: github-actions
directory: /
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#scheduleinterval
schedule:
interval: daily
interval: monthly
open-pull-requests-limit: 1
labels:
- tag:bot
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit-autoupdate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: pre-commit-autoupdate

on:
schedule:
- cron: 0 0 * * *
- cron: 0 0 1 1,4,7,10 * # quarterly
workflow_dispatch:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit-optional-autoupdate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: pre-commit-optional-autoupdate

on:
schedule:
- cron: 0 0 * * *
- cron: 0 0 1 1,4,7,10 * # quarterly
workflow_dispatch:

jobs:
Expand Down
18 changes: 11 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@
# https://github.com/autowarefoundation/sync-file-templates
# To make changes, update the source repository and follow the guidelines in its README.

# https://pre-commit.ci/#configuration
ci:
autofix_commit_msg: "style(pre-commit): autofix"
# we already have our own daily update mechanism, we set this to quarterly
autoupdate_schedule: quarterly
autoupdate_commit_msg: "ci(pre-commit): quarterly autoupdate"

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-json
- id: check-merge-conflict
Expand All @@ -22,7 +26,7 @@ repos:
args: [--markdown-linebreak-ext=md]

- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.41.0
rev: v0.43.0
hooks:
- id: markdownlint
args: [-c, .markdownlint.yaml, --fix]
Expand Down Expand Up @@ -53,7 +57,7 @@ repos:
- id: shellcheck

- repo: https://github.com/scop/pre-commit-shfmt
rev: v3.9.0-1
rev: v3.10.0-2
hooks:
- id: shfmt
args: [-w, -s, -i=4]
Expand All @@ -64,26 +68,26 @@ repos:
- id: isort

- repo: https://github.com/psf/black
rev: 24.8.0
rev: 24.10.0
hooks:
- id: black
args: [--line-length=100]

- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v18.1.8
rev: v19.1.5
hooks:
- id: clang-format
types_or: [c++, c, cuda]

- repo: https://github.com/cpplint/cpplint
rev: 1.6.1
rev: 2.0.0
hooks:
- id: cpplint
args: [--quiet]
exclude: .cu

- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.29.2
rev: 0.30.0
hooks:
- id: check-metaschema
files: ^.+/schema/.*schema\.json$
Expand Down
2 changes: 2 additions & 0 deletions CPPLINT.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ set noparent
linelength=100
includeorder=standardcfirst
filter=-build/c++11 # we do allow C++11
filter=-build/c++17 # we allow <filesystem>
filter=-build/namespaces_literals # we allow using namespace for literals
filter=-runtime/references # we consider passing non-const references to be ok
filter=-whitespace/braces # we wrap open curly braces for namespaces, classes and functions
filter=-whitespace/indent # we don't indent keywords like public, protected and private with one space
filter=-whitespace/newline # we allow the developer to decide about newline at the end of file (it's clashing with clang-format)
filter=-whitespace/parens # we allow closing parenthesis to be on the next line
filter=-whitespace/semicolon # we allow the developer to decide about whitespace after a semicolon
filter=-build/header_guard # we automatically fix the names of header guards using pre-commit
Expand Down
5 changes: 0 additions & 5 deletions autoware.repos
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ repositories:
type: git
url: https://github.com/autowarefoundation/autoware_internal_msgs.git
version: 1.1.0
# TODO(youtalk): Remove autoware_common when https://github.com/autowarefoundation/autoware/issues/4911 is closed
core/autoware_common:
type: git
url: https://github.com/autowarefoundation/autoware_common.git
version: remove-autoware-cmake-utils
core/autoware_cmake:
type: git
url: https://github.com/autowarefoundation/autoware_cmake.git
Expand Down
2 changes: 1 addition & 1 deletion simulator.repos
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ repositories:
simulator/scenario_simulator:
type: git
url: https://github.com/tier4/scenario_simulator_v2.git
version: RJD-736/autoware_msgs_support # TODO(mitsudome-r): switch back to master once this branch is merged
version: 7.3.1

0 comments on commit a571d3d

Please sign in to comment.