Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
GregoryLeMasurier committed Sep 13, 2021
2 parents d1f2a29 + 278e60e commit a45c0cc
Show file tree
Hide file tree
Showing 165 changed files with 10,258 additions and 5,362 deletions.
24 changes: 0 additions & 24 deletions .appveyor.yml

This file was deleted.

4 changes: 4 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# These are supported funding model platforms

github: facontidavide
custom: https://www.paypal.me/facontidavide
27 changes: 27 additions & 0 deletions .github/workflows/build_ubuntu.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: build and run tests
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
# install dependencies
- name: apt
run: sudo apt-get update && sudo apt-get install -yq libzmq3-dev libdw-dev libgtest-dev cmake
- name: Install gtest manually
run: cd /usr/src/gtest && sudo cmake CMakeLists.txt && sudo make && sudo cp *.a /usr/lib
# build project
- name: mkdir
run: mkdir build
- name: cmake build
run: cmake -Bbuild -H.
- name: cmake make
run: cmake --build build/ --target all
# run tests
- name: run test
run: build/test/behaviortree_cpp_v3_test

18 changes: 18 additions & 0 deletions .github/workflows/ros1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: ros1

on: [push, pull_request]

jobs:
industrial_ci:
strategy:
matrix:
env:
- {ROS_DISTRO: melodic, ROS_REPO: main}
- {ROS_DISTRO: kinetic, ROS_REPO: main}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: 'ros-industrial/industrial_ci@master'
env: ${{matrix.env}}
with:
package-name: behaviortree_cpp_v3
17 changes: 17 additions & 0 deletions .github/workflows/ros2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: ros2

on: [push, pull_request]

jobs:
industrial_ci:
strategy:
matrix:
env:
- {ROS_DISTRO: eloquent, ROS_REPO: main}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: 'ros-industrial/industrial_ci@master'
env: ${{matrix.env}}
with:
package-name: behaviortree_cpp_v3
60 changes: 0 additions & 60 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,68 +11,10 @@ os:
compiler:
- gcc

conan-linux: &conan-linux
os: linux
dist: xenial
language: python
python: "3.7"
services:
- docker
before_install:
- true
install:
- ./conan/travis/install.sh
script:
- ./conan/travis/build.sh

conan-osx: &conan-osx
os: osx
language: generic
before_install:
- true
install:
- ./conan/travis/install.sh
script:
- ./conan/travis/build.sh

matrix:
include:
- bare_linux:
env: ROS_DISTRO="none"
- ros_indigo:
env: ROS_DISTRO="kinetic"
- ros_kinetic:
env: ROS_DISTRO="lunar"
- ros_melodic:
env: ROS_DISTRO="melodic"
# - <<: *conan-linux
# env: CONAN_GCC_VERSIONS=5 CONAN_DOCKER_IMAGE=conanio/gcc5 ROS_DISTRO="none"
# - <<: *conan-linux
# env: CONAN_GCC_VERSIONS=6 CONAN_DOCKER_IMAGE=conanio/gcc6 ROS_DISTRO="none"
# - <<: *conan-linux
# env: CONAN_GCC_VERSIONS=7 CONAN_DOCKER_IMAGE=conanio/gcc7 ROS_DISTRO="none"
# - <<: *conan-linux
# env: CONAN_GCC_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/gcc8 ROS_DISTRO="none"
# - <<: *conan-linux
# env: CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=conanio/clang39 ROS_DISTRO="none"
# - <<: *conan-linux
# env: CONAN_CLANG_VERSIONS=4.0 CONAN_DOCKER_IMAGE=conanio/clang40 ROS_DISTRO="none"
# - <<: *conan-linux
# env: CONAN_CLANG_VERSIONS=5.0 CONAN_DOCKER_IMAGE=conanio/clang50 ROS_DISTRO="none"
# - <<: *conan-linux
# env: CONAN_CLANG_VERSIONS=6.0 CONAN_DOCKER_IMAGE=conanio/clang60 ROS_DISTRO="none"
# - <<: *conan-osx
# osx_image: xcode8.3
# env: CONAN_APPLE_CLANG_VERSIONS=8.1 ROS_DISTRO="none"
# - <<: *conan-osx
# osx_image: xcode9
# env: CONAN_APPLE_CLANG_VERSIONS=9.0 ROS_DISTRO="none"
# - <<: *conan-osx
# osx_image: xcode9.4
# env: CONAN_APPLE_CLANG_VERSIONS=9.1 ROS_DISTRO="none"
# - <<: *conan-osx
# osx_image: xcode10.1
# env: CONAN_APPLE_CLANG_VERSIONS=10.0 ROS_DISTRO="none"
fast_finish: false

before_install:
Expand All @@ -96,5 +38,3 @@ before_script:
script:
- if [ "$ROS_DISTRO" = "none" ]; then (cd build; cmake .. ; sudo cmake --build . --target install; ./bin/behaviortree_cpp_v3_test); fi
- if [ "$ROS_DISTRO" != "none" ]; then (.ci_config/travis.sh); fi


201 changes: 0 additions & 201 deletions 3rdparty/coroutine/LICENSE

This file was deleted.

Loading

0 comments on commit a45c0cc

Please sign in to comment.