Skip to content

Commit

Permalink
Merge pull request #4 from tier4/sync-upstream
Browse files Browse the repository at this point in the history
chore: sync upstream
  • Loading branch information
tier4-autoware-public-bot[bot] authored Sep 11, 2022
2 parents a1caea7 + 2a3eaf5 commit 082f1ef
Show file tree
Hide file tree
Showing 10 changed files with 51 additions and 39 deletions.
53 changes: 28 additions & 25 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
Checks: "
-*,
boost-use-to-string,
Expand Down Expand Up @@ -200,7 +199,7 @@ WarningsAsErrors: "
readability-misplaced-array-index,
readability-string-compare"

HeaderFilterRegex: "^(?!\/usr)(?!\/opt)"
HeaderFilterRegex: ^(?!\/usr)(?!\/opt)

AnalyzeTemporaryDtors: false

Expand Down Expand Up @@ -230,7 +229,7 @@ CheckOptions:
- key: bugprone-assert-side-effect.CheckFunctionCalls
value: "0"
- key: bugprone-dangling-handle.HandleClasses
value: "std::basic_string_view;std::experimental::basic_string_view"
value: std::basic_string_view;std::experimental::basic_string_view
- key: bugprone-dynamic-static-initializers.HeaderFileExtensions
value: ",h,hh,hpp,hxx"
- key: bugprone-exception-escape.FunctionsThatShouldNotThrow
Expand Down Expand Up @@ -274,25 +273,25 @@ CheckOptions:
- key: bugprone-unhandled-self-assignment.WarnOnlyIfThisHasSuspiciousField
value: "1"
- key: bugprone-unused-return-value.CheckedFunctions
value: "::std::async;::std::launder;::std::remove;::std::remove_if;::std::unique;::std::unique_ptr::release;::std::basic_string::empty;::std::vector::empty"
value: ::std::async;::std::launder;::std::remove;::std::remove_if;::std::unique;::std::unique_ptr::release;::std::basic_string::empty;::std::vector::empty
- key: cert-dcl16-c.NewSuffixes
value: "L;LL;LU;LLU"
value: L;LL;LU;LLU
- key: cert-oop54-cpp.WarnOnlyIfThisHasSuspiciousField
value: "0"
- key: cppcoreguidelines-explicit-virtual-functions.IgnoreDestructors
value: "1"
- key: cppcoreguidelines-macro-usage.AllowedRegexp
value: "^DEBUG_*"
value: ^DEBUG_*
- key: cppcoreguidelines-macro-usage.CheckCapsOnly
value: "0"
- key: cppcoreguidelines-macro-usage.IgnoreCommandLineMacros
value: "1"
- key: cppcoreguidelines-no-malloc.Allocations
value: "::malloc;::calloc"
value: ::malloc;::calloc
- key: cppcoreguidelines-no-malloc.Deallocations
value: "::free"
value: ::free
- key: cppcoreguidelines-no-malloc.Reallocations
value: "::realloc"
value: ::realloc
- key: cppcoreguidelines-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
value: "1"
- key: cppcoreguidelines-pro-type-member-init.IgnoreArrays
Expand Down Expand Up @@ -332,17 +331,17 @@ CheckOptions:
- key: modernize-make-shared.IgnoreMacros
value: "1"
- key: modernize-make-shared.IncludeStyle
value: "google"
value: google
- key: modernize-make-shared.MakeSmartPtrFunction
value: "std::make_shared"
value: std::make_shared
- key: modernize-make-shared.MakeSmartPtrFunctionHeader
value: memory
- key: modernize-make-unique.IgnoreMacros
value: "1"
- key: modernize-make-unique.IncludeStyle
value: "google"
value: google
- key: modernize-make-unique.MakeSmartPtrFunction
value: "std::make_unique"
value: std::make_unique
- key: modernize-make-unique.MakeSmartPtrFunctionHeader
value: memory
- key: modernize-pass-by-value.IncludeStyle
Expand All @@ -364,13 +363,13 @@ CheckOptions:
- key: modernize-use-default-member-init.UseAssignment
value: "0"
- key: modernize-use-emplace.ContainersWithPushBack
value: "::std::vector;::std::list;::std::deque"
value: ::std::vector;::std::list;::std::deque
- key: modernize-use-emplace.SmartPointers
value: "::std::shared_ptr;::std::unique_ptr;::std::auto_ptr;::std::weak_ptr"
value: ::std::shared_ptr;::std::unique_ptr;::std::auto_ptr;::std::weak_ptr
- key: modernize-use-emplace.TupleMakeFunctions
value: "::std::make_pair;::std::make_tuple"
value: ::std::make_pair;::std::make_tuple
- key: modernize-use-emplace.TupleTypes
value: "::std::pair;::std::tuple"
value: ::std::pair;::std::tuple
- key: modernize-use-equals-default.IgnoreMacros
value: "1"
- key: modernize-use-equals-delete.IgnoreMacros
Expand All @@ -396,7 +395,7 @@ CheckOptions:
- key: modernize-use-using.IgnoreMacros
value: "1"
- key: performance-faster-string-find.StringLikeClasses
value: "std::basic_string"
value: std::basic_string
- key: performance-for-range-copy.AllowedTypes
value: ""
- key: performance-for-range-copy.WarnOnAllAutoCopies
Expand All @@ -406,7 +405,7 @@ CheckOptions:
- key: performance-inefficient-vector-operation.EnableProto
value: "0"
- key: performance-inefficient-vector-operation.VectorLikeClasses
value: "::std::vector"
value: ::std::vector
- key: performance-move-const-arg.CheckTriviallyCopyableMove
value: "1"
- key: performance-move-constructor-init.IncludeStyle
Expand All @@ -418,7 +417,7 @@ CheckOptions:
- key: performance-unnecessary-copy-initialization.AllowedTypes
value: ""
- key: performance-unnecessary-value-param.AllowedTypes
value: ".*Ptr;.*SharedFuture"
value: .*Ptr;.*SharedFuture
- key: performance-unnecessary-value-param.IncludeStyle
value: google
- key: portability-simd-intrinsics.Std
Expand All @@ -433,25 +432,29 @@ CheckOptions:
value: lower_case
- key: readability-identifier-naming.ClassCase
value: CamelCase
- key: readability-identifier-naming.PrivateMemberPrefix
value: ""
- key: readability-identifier-naming.PrivateMemberSuffix
value: _
- key: readability-identifier-naming.StructCase
value: CamelCase
- key: readability-identifier-naming.FunctionCase
value: lower_case
- key: readability-identifier-naming.VariableCase
value: lower_case
- key: readability-identifier-naming.GlobalConstantCase
value: UPPER_CASE
value: lower_case
- key: readability-identifier-naming.GlobalConstantPrefix
value: g_
- key: readability-identifier-naming.ConstexprVariableCase
value: lower_case
- key: readability-inconsistent-declaration-parameter-name.IgnoreMacros
value: "1"
- key: readability-inconsistent-declaration-parameter-name.Strict
value: "0"
- key: readability-redundant-smartptr-get.IgnoreMacros
value: "1"
- key: readability-redundant-string-init.StringNames
value: "::std::basic_string"
value: ::std::basic_string
- key: readability-simplify-subscript-expr.Types
value: "::std::basic_string;::std::basic_string_view;::std::vector;::std::array"
value: ::std::basic_string;::std::basic_string_view;::std::vector;::std::array
- key: readability-static-accessed-through-instance.NameSpecifierNestingThreshold
value: "3"
2 changes: 1 addition & 1 deletion .github/workflows/build-humble-self-hosted.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: build-humble-self-hosted

on:
schedule:
- cron: 0 0 * * 0
- cron: 0 12 * * *
workflow_dispatch:

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

on:
schedule:
- cron: 0 0 * * 0
- cron: 0 12 * * *
workflow_dispatch:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-main-self-hosted.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: build-main-self-hosted

on:
schedule:
- cron: 0 0 * * 0
- cron: 0 12 * * *
workflow_dispatch:

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

on:
schedule:
- cron: 0 0 * * 0
- cron: 0 12 * * *
workflow_dispatch:

jobs:
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/cancel-previous-workflows.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: cancel-previous-workflows

on:
pull_request_target:

jobs:
cancel-previous-workflows:
runs-on: ubuntu-latest
steps:
- name: Cancel previous runs
uses: styfle/[email protected]
with:
workflow_id: all
all_but_latest: true
1 change: 0 additions & 1 deletion .yamllint.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
extends: default

ignore: |
.clang-tidy
*.param.yaml
rules:
Expand Down
7 changes: 0 additions & 7 deletions ansible/roles/plotjuggler/tasks/main.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
# Workaround for https://serverfault.com/questions/1099606/ansible-openssl-error-with-apt-module
- name: Upgrade pyOpenSSL
ansible.builtin.pip:
name: pyOpenSSL
state: latest
executable: pip3

- name: Install plotjuggler
become: true
ansible.builtin.apt:
Expand Down
1 change: 1 addition & 0 deletions ansible/roles/tensorrt/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
- libnvinfer-plugin-dev={{ tensorrt_version }}
- libnvparsers-dev={{ tensorrt_version }}
- libnvonnxparsers-dev={{ tensorrt_version }}
allow_change_held_packages: true
allow_downgrade: true
update_cache: true

Expand Down
6 changes: 4 additions & 2 deletions setup-dev-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,11 @@ fi

# Install ansible
ansible_version=$(pip3 list | grep -oP "^ansible\s+\K([0-9]+)" || true)
if [ "$ansible_version" != "5" ]; then
if [ "$ansible_version" != "6" ]; then
sudo apt-get -y purge ansible
pip3 install -U "ansible==5.*"
pip3 install -U "ansible==6.*"
# Workaround for https://github.com/autowarefoundation/autoware/issues/2849
pip3 install -U "pyOpenSSL>=22.0.0"
fi

# For Python packages installed with user privileges
Expand Down

0 comments on commit 082f1ef

Please sign in to comment.