diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 562f4f0e1..0c9bcac39 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -235,6 +235,7 @@ jobs: # setup catkin tools apt install -qq -y python3-pip pip3 install catkin-tools + pip3 install -U catkin-pkg # Old catkin_pkg raises TypeError: find_packages() got an unexpected keyword argument 'ignore_markers' in catkin build # setup build tools apt install -qq -y cmake build-essential catkin ros-one-rosbash diff --git a/.travis b/.travis index b223c886b..e28b2ff6a 160000 --- a/.travis +++ b/.travis @@ -1 +1 @@ -Subproject commit b223c886bcda0d96c6c03b0f0ae07da768a00155 +Subproject commit e28b2ff6a142ac6ae49c636753d33a98f2f603d3