Skip to content

Merge master main#14

Closed
shaur-k wants to merge 34 commits intomainfrom
merge-master-main
Closed

Merge master main#14
shaur-k wants to merge 34 commits intomainfrom
merge-master-main

Conversation

@shaur-k
Copy link

@shaur-k shaur-k commented Jul 22, 2025

No description provided.

cktii and others added 30 commits February 25, 2025 18:38
@cktii
feat: add fuzzing harnesses (BehaviorTree#925)
14589e5
@devis12
Bug fix/set blackboard (BehaviorTree#955)
3651a24
@sarcasticnature
Fix testing CMake issue to resolve Rolling regression (BehaviorTree#961)
3a00bc3 
* Fix unit test CMake bug and small typos

* Fix bug when building with ros when testing is off

* Revert commit and eliminate BUILD_TESTING check
@facontidavide
Fix CI, add BUILD_TESTS and remove catkin support
ac26aea
@facontidavide
extend JSOn convertion to include vectors
0b06807
@facontidavide
fixing comments
1e473fe
@facontidavide
extend JSON convertion to include vectors (BehaviorTree#965)
0ee319b 
* extend JSOn convertion to include vectors

* fixing comments
@facontidavide
fix issue 945
3ac3191
@facontidavide
Merge branch 'add_vector_to_json'
9c1aa08
@dsobek
Fix Precondition to only check condition once (BehaviorTree#904)
5f3f675
@facontidavide
Update README.md
2d9a365
@facontidavide
Fix dangling‐capture in TestNodeConfig
3540b4a
@facontidavide
Merge branch 'master' of github.com:BehaviorTree/BehaviorTree.CPP
e0d1526
@facontidavide
change TestNodeConfig preferred constructor
2da7906
@facontidavide
prepare release
09f40f5
@facontidavide
4.7.0
d5100e6
@facontidavide
Update README.md
26f94d8
@facontidavide
Update README.md
a37d7bb
@facontidavide
more hanges related to TestNode
9b29c99
@dsobek
Make BT::Any::copyInto const (BehaviorTree#970)
5a158ef
@facontidavide
Update Doxyfile
db6d3f7
@sven-hoek
Add action to publish Doxygen documentation as GH Page (BehaviorTree#972
3c62813 
)

* Add GH Action to publish Doxygen

* Add link in README
@facontidavide
fix ROS CI
0d1e2e2
@facontidavide
Merge branch 'master' of github.com:BehaviorTree/BehaviorTree.CPP
f09b8c2
@facontidavide
prepare release
84319fe
@facontidavide
4.7.1
793a6bd
@tony-p
fix: Make impossible to accidently copy JsonExporter singleton (Behav…
7ffab7e 
…iorTree#975)
@leander-dsouza
Added codespell as a pre-commit hook. (BehaviorTree#977)
c4b93cf 
Signed-off-by: Leander Stephen D'Souza <leanderdsouza1234@gmail.com>
@facontidavide
disable failing CI
4b7177a
@facontidavide
Fix issue BehaviorTree#978 : skiped was not working properly
689fb9f
@shaur-k shaur-k requested a review from dsobek July 22, 2025 16:34
@shaur-k shaur-k self-assigned this Jul 22, 2025
@shaur-k shaur-k requested a review from dyackzan July 22, 2025 16:34
@dsobek
Copy link

dsobek commented Jul 22, 2025

Just to clarify, is BehaviorTree.CPP's master or Picknik's fork master.

@shaur-k
Copy link
Author

shaur-k commented Jul 22, 2025

PickNik's fork master that is synced with BTCPP master

@dyackzan
Copy link

dyackzan commented Jul 23, 2025

I think we should do some more testing to make sure this is going to be ok, there are a lot of changes and I see Davide made some changes to the JSON serialization stuff too which could mess with the work we did to pass things through to the blackboard viewer 0b06807

@dyackzan
Copy link

dyackzan commented Jul 24, 2025

I created a PR that rebases our main branch on the upstream master branch and reverts Davide's upstream json changes that clash with ours and it builds and passes the local tests so that will probably be a better point to work from #15.
It should still be tested to make sure the blackboard viewer didn't get messed up and all the integration tests pass before merging

dyackzan
dyackzan suggested changes Jul 24, 2025
View reviewed changes
Copy link

@dyackzan dyackzan left a comment

Choose a reason for hiding this comment

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

see last comment

@shaur-k shaur-k closed this Jul 29, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dsobek dsobek Awaiting requested review from dsobek

1 more reviewer

@dyackzan dyackzan dyackzan requested changes

Reviewers whose approvals may not affect merge requirements

Assignees

@shaur-k shaur-k

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@shaur-k @dsobek @dyackzan @cktii @devis12 @sarcasticnature @facontidavide @sven-hoek @tony-p @leander-dsouza