From aada19b4e628429a2b6f142b1f1415b2599cc390 Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Fri, 7 Sep 2018 09:48:45 -0700 Subject: [PATCH] install catkin_pkg instead of using ament_package --- .appveyor.yml | 2 +- .travis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 8aa64c62..bec5ddf5 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 @@ -27,7 +28,6 @@ install: - mkdir ament - cd ament - git clone https://github.com/ament/ament_cmake.git - - git clone https://github.com/ament/ament_package.git - git clone https://github.com/ament/ament_tools.git - git clone https://github.com/osrf/osrf_pycommon.git - git clone https://github.com/ament/googletest diff --git a/.travis.yml b/.travis.yml index 79795d59..a7047176 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 @@ -27,7 +28,6 @@ script: # Fetch dependencies into the workspace - cd src/ament - git clone https://github.com/ament/ament_cmake.git - - git clone https://github.com/ament/ament_package.git - git clone https://github.com/ament/ament_tools.git - git clone https://github.com/osrf/osrf_pycommon.git - git clone https://github.com/ament/googletest