Skip to content

Commit 8e7be15

Browse files
committed
Merge tag 'tags/4.7.2' into sync-bt
2 parents eede207 + 1296e8d commit 8e7be15

File tree

382 files changed

+20280
-16214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

382 files changed

+20280
-16214
lines changed

.clang-format

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
BasedOnStyle: Google
2+
BasedOnStyle: Google
33
AccessModifierOffset: -2
44
ConstructorInitializerIndentWidth: 2
55
AlignEscapedNewlinesLeft: false
@@ -8,15 +8,13 @@ AllowAllParametersOfDeclarationOnNextLine: false
88
AllowShortIfStatementsOnASingleLine: false
99
AllowShortLoopsOnASingleLine: false
1010
AllowShortFunctionsOnASingleLine: None
11-
AllowShortLoopsOnASingleLine: false
1211
AlwaysBreakTemplateDeclarations: true
1312
AlwaysBreakBeforeMultilineStrings: false
1413
BreakBeforeBinaryOperators: false
1514
BreakBeforeTernaryOperators: false
16-
BreakConstructorInitializersBeforeComma: false
17-
BreakConstructorInitializers: AfterColon
15+
BreakConstructorInitializers: BeforeComma
1816
BinPackParameters: true
19-
ColumnLimit: 90
17+
ColumnLimit: 90
2018
ConstructorInitializerAllOnOneLineOrOnePerLine: true
2119
DerivePointerBinding: false
2220
PointerBindsToType: true
@@ -31,19 +29,20 @@ PenaltyBreakString: 1
3129
PenaltyBreakFirstLessLess: 1000
3230
PenaltyExcessCharacter: 1000
3331
PenaltyReturnTypeOnItsOwnLine: 90
34-
SpacesBeforeTrailingComments: 3
35-
Cpp11BracedListStyle: true
36-
Standard: Auto
37-
IndentWidth: 2
38-
TabWidth: 2
39-
UseTab: Never
32+
SpacesBeforeTrailingComments: 2
33+
Cpp11BracedListStyle: false
34+
Standard: Auto
35+
IndentWidth: 2
36+
TabWidth: 2
37+
UseTab: Never
4038
IndentFunctionDeclarationAfterType: false
4139
SpacesInParentheses: false
42-
SpacesInAngles: false
40+
SpacesInAngles: false
4341
SpaceInEmptyParentheses: false
4442
SpacesInCStyleCastParentheses: false
4543
SpaceAfterControlStatementKeyword: true
4644
SpaceBeforeAssignmentOperators: true
45+
SpaceBeforeParens: Never
4746
ContinuationIndentWidth: 4
4847
SortIncludes: false
4948
SpaceAfterCStyleCast: false
@@ -54,17 +53,16 @@ BreakBeforeBraces: Custom
5453

5554
# Control of individual brace wrapping cases
5655
BraceWrapping: {
57-
AfterClass: 'true'
58-
AfterControlStatement: 'true'
59-
AfterEnum : 'true'
60-
AfterFunction : 'true'
61-
AfterNamespace : 'true'
62-
AfterStruct : 'true'
63-
AfterUnion : 'true'
64-
BeforeCatch : 'true'
65-
BeforeElse : 'true'
66-
IndentBraces : 'false'
56+
AfterClass: 'true',
57+
AfterControlStatement: 'true',
58+
AfterEnum : 'true',
59+
AfterFunction : 'true',
60+
AfterNamespace : 'true',
61+
AfterStruct : 'true',
62+
AfterUnion : 'true',
63+
BeforeCatch : 'true',
64+
BeforeElse : 'true',
65+
IndentBraces : 'false',
6766
SplitEmptyFunction: 'false'
6867
}
6968
...
70-

.codespell_ignore_words

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
INOUT
2+
InOut
3+
delimeter
4+
Succesful
5+
worl
6+
valu
7+
Exeption
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
name: Bug report
3+
about: Help me help you...
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
If you are experiencing a crash, provide a backtrace (GDB or similar).
14+
15+
*How to Reproduce**
16+
17+
Please provide a specific description of how to reproduce the issue or source code that can be compiled and executed. Please attach a file/project that is easy to compile, don't copy and paste code snippets!
18+
19+
Even better, create a Pull Request with a failing unit test.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is.
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

.github/pull_request_template.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!--
2+
You must run clang-format, otherwise your change may not pass the tests on CI
3+
We recommend using pre-commit.
4+
5+
To use:
6+
pre-commit run -a
7+
Or:
8+
pre-commit install # (runs every time you commit in git)
9+
10+
See https://github.com/pre-commit/pre-commit
11+
-->

.github/workflows/cmake_ubuntu.yml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: cmake Ubuntu
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
types: [opened, synchronize, reopened]
49

510
env:
611
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@@ -15,22 +20,17 @@ jobs:
1520
runs-on: ${{ matrix.os }}
1621
strategy:
1722
matrix:
18-
os: [ubuntu-20.04]
23+
os: [ubuntu-22.04]
1924

2025
steps:
2126
- uses: actions/checkout@v2
22-
27+
2328
- name: Install Conan
2429
id: conan
2530
uses: turtlebrowser/get-conan@main
26-
with:
27-
version: 1.59.0
28-
29-
- name: Create default profile
30-
run: conan profile new default --detect
3131

32-
- name: Update profile
33-
run: conan profile update settings.compiler.libcxx=libstdc++11 default
32+
- name: Create default profile
33+
run: conan profile detect
3434

3535
- name: Create Build Environment
3636
# Some projects don't allow in-source building, so create a separate build directory
@@ -44,17 +44,16 @@ jobs:
4444
- name: Configure CMake
4545
shell: bash
4646
working-directory: ${{github.workspace}}/build
47-
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake
47+
run: cmake ${{github.workspace}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake
4848

4949
- name: Build
5050
shell: bash
5151
working-directory: ${{github.workspace}}/build
5252
run: cmake --build . --config ${{env.BUILD_TYPE}}
53-
53+
5454
- name: run test (Linux)
55-
working-directory: ${{github.workspace}}/build
56-
run: ./tests/behaviortree_cpp_test
57-
55+
working-directory: ${{github.workspace}}/build/tests
56+
run: ctest
57+
5858
- name: Upload coverage reports to Codecov
5959
uses: codecov/codecov-action@v3
60-

.github/workflows/cmake_windows.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: cmake Windows
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
types: [opened, synchronize, reopened]
49

510
env:
611
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@@ -18,16 +23,14 @@ jobs:
1823
os: [windows-latest]
1924

2025
steps:
21-
- uses: actions/checkout@v2
22-
26+
- uses: actions/checkout@v4
27+
2328
- name: Install Conan
2429
id: conan
2530
uses: turtlebrowser/get-conan@main
26-
with:
27-
version: 1.59.0
28-
31+
2932
- name: Create default profile
30-
run: conan profile new default --detect
33+
run: conan profile detect
3134

3235
- name: Create Build Environment
3336
# Some projects don't allow in-source building, so create a separate build directory
@@ -47,8 +50,7 @@ jobs:
4750
working-directory: ${{github.workspace}}/build
4851
shell: bash
4952
run: cmake --build . --config ${{env.BUILD_TYPE}}
50-
53+
5154
- name: run test (Windows)
5255
working-directory: ${{github.workspace}}/build
5356
run: $env:PATH+=";${{env.BUILD_TYPE}}"; tests/${{env.BUILD_TYPE}}/behaviortree_cpp_test.exe
54-
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Doxygen GitHub Pages Deploy Action
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- master
8+
9+
jobs:
10+
deploy:
11+
runs-on: ubuntu-latest
12+
permissions:
13+
contents: write
14+
steps:
15+
- uses: DenverCoder1/[email protected]
16+
with:
17+
github_token: ${{ secrets.GITHUB_TOKEN }}
18+
folder: doc/html

.github/workflows/pixi.yaml

Lines changed: 13 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,27 @@
11
name: Pixi (conda)
22

3-
on: [push, pull_request]
4-
5-
env:
6-
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
7-
# Note if this value is changed, has to be manually updated in the `windows-latest` tests_command
8-
BUILD_TYPE: Release
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
types: [opened, synchronize, reopened]
99

1010
jobs:
1111
pixi_conda_build:
1212
strategy:
1313
matrix:
14-
include:
15-
- os: windows-latest
16-
build_depend: vs2022_win-64=19.*
17-
tests_command: "'PATH=\\\"$PATH;build/Release\\\" build/tests/Release/behaviortree_cpp_test.exe'"
18-
- os: ubuntu-latest
19-
build_depend: "gxx=12.2.*"
20-
tests_command: "./build/tests/behaviortree_cpp_test"
14+
os:
15+
- windows-latest
16+
- ubuntu-latest
2117
runs-on: ${{ matrix.os }}
2218
steps:
2319
# Pixi is the tool used to create/manage conda environment
24-
- uses: prefix-dev/[email protected]
25-
with:
26-
pixi-version: v0.7.0
27-
locked: false
28-
frozen: false
29-
run-install: false
30-
manifest-path: build-env/pixi.yaml
31-
- name: Make pixi workspace
32-
run: |
33-
pixi init build-env
34-
- name: Install dependencies
35-
working-directory: ${{github.workspace}}/build-env
36-
run: |
37-
pixi add cmake zeromq=4.3.4 gtest=1.12.* gmock=1.12.* sqlite=3.40.* ${{ matrix.build-depend }}
38-
pixi install
39-
- name: Create Build Directory
40-
working-directory: ${{github.workspace}}/build-env
41-
run: mkdir build
4220
- uses: actions/checkout@v3
21+
- uses: prefix-dev/[email protected]
4322
with:
44-
path: build-env/BehaviorTree.CPP
23+
pixi-version: v0.40.3
4524
- name: Build
46-
working-directory: ${{github.workspace}}/build-env
47-
run: |
48-
pixi task add build "cd build; cmake ../BehaviorTree.CPP -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}; cmake --build . --parallel --config ${{env.BUILD_TYPE}}"
49-
pixi run build
25+
run: pixi run build
5026
- name: Run tests
51-
working-directory: ${{github.workspace}}/build-env
52-
run: |
53-
pixi task add tests ${{ matrix.tests_command }}
54-
pixi run tests
55-
56-
57-
58-
27+
run: pixi run test

.github/workflows/pre-commit.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: pre-commit
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
types: [opened, synchronize, reopened]
9+
10+
jobs:
11+
pre-commit:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v3
15+
- uses: actions/setup-python@v3
16+
- uses: pre-commit/[email protected]

0 commit comments

Comments
 (0)