From 2a2dacb9cdfe4c13634608d698918b7371cc4281 Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Fri, 7 Sep 2018 09:48:45 -0700 Subject: [PATCH 1/2] install catkin_pkg in CI builds --- .appveyor.yml | 1 + .travis.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index 8aa64c62..3848f9c3 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -14,6 +14,7 @@ install: - set "PATH=%PATH%;C:\Python35" - python --version - python -m pip install -U setuptools pip + - python -m pip install catkin_pkg - python -m pip install EmPy - python -m pip install trollius - python -m pip install pyparsing diff --git a/.travis.yml b/.travis.yml index 79795d59..2effd229 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,7 @@ install: else if ! brew ls --version cmake &>/dev/null; then brew install cmake; fi fi + - pip install catkin_pkg script: - mkdir -p build/src/ament - cd build From 473ac496b7236bd78c81618764666e0cb09f20d7 Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Fri, 7 Sep 2018 10:04:15 -0700 Subject: [PATCH 2/2] also clone console_bridge_vendor --- .appveyor.yml | 1 + .travis.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index 3848f9c3..2f35a7f7 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -24,6 +24,7 @@ install: - cd src - python -c "import shutil; shutil.copytree('../..', './class_loader', ignore=shutil.ignore_patterns('build'))" - git clone https://github.com/ros/console_bridge.git + - git clone https://github.com/ros2/console_bridge_vendor.git - git clone https://github.com/ros2/poco_vendor.git - mkdir ament - cd ament diff --git a/.travis.yml b/.travis.yml index 2effd229..9d9af735 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,7 @@ script: - git clone https://github.com/ament/googletest - cd .. - git clone https://github.com/ros/console_bridge.git + - git clone https://github.com/ros2/console_bridge_vendor.git - git clone https://github.com/ros2/poco_vendor.git - cd .. # Link source into workspace's source space