Skip to content

Commit be1bc3d

Browse files
committed
Merge commit '278e60e' into develop
2 parents 37d1c99 + 278e60e commit be1bc3d

Some content is hidden

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

43 files changed

+3860
-579
lines changed

.appveyor.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/workflows/build_ubuntu.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# name: build and run tests
2+
# on:
3+
# push:
4+
# branches: [ master ]
5+
# pull_request:
6+
# branches: [ master ]
7+
# jobs:
8+
# build:
9+
# runs-on: ubuntu-latest
10+
# steps:
11+
# - uses: actions/checkout@v2
12+
# # install dependencies
13+
# - name: apt
14+
# run: sudo apt-get update && sudo apt-get install -yq libzmq3-dev libdw-dev libgtest-dev cmake
15+
# - name: Install gtest manually
16+
# run: cd /usr/src/gtest && sudo cmake CMakeLists.txt && sudo make && sudo cp *.a /usr/lib
17+
# # build project
18+
# - name: mkdir
19+
# run: mkdir build
20+
# - name: cmake build
21+
# run: cmake -Bbuild -H.
22+
# - name: cmake make
23+
# run: cmake --build build/ --target all
24+
# # run tests
25+
# - name: run test
26+
# run: build/test/behaviortree_cpp_v3_test
27+

.travis.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,6 @@ os:
1111
compiler:
1212
- gcc
1313

14-
conan-linux: &conan-linux
15-
os: linux
16-
dist: xenial
17-
language: python
18-
python: "3.7"
19-
services:
20-
- docker
21-
before_install:
22-
- true
23-
install:
24-
- ./conan/travis/install.sh
25-
script:
26-
- ./conan/travis/build.sh
27-
28-
conan-osx: &conan-osx
29-
os: osx
30-
language: generic
31-
before_install:
32-
- true
33-
install:
34-
- ./conan/travis/install.sh
35-
script:
36-
- ./conan/travis/build.sh
37-
3814
matrix:
3915
include:
4016
- bare_linux:
@@ -62,5 +38,3 @@ before_script:
6238
script:
6339
- if [ "$ROS_DISTRO" = "none" ]; then (cd build; cmake .. ; sudo cmake --build . --target install; ./bin/behaviortree_cpp_v3_test); fi
6440
- if [ "$ROS_DISTRO" != "none" ]; then (.ci_config/travis.sh); fi
65-
66-

0 commit comments

Comments
 (0)