From 31e7adfe72186ee88fdcceb06f63e5ac6aaacbbc Mon Sep 17 00:00:00 2001 From: Johannes Mey <johannes.mey@tu-dresden.de> Date: Wed, 13 May 2020 09:17:35 +0200 Subject: [PATCH] simplify CI script --- .gitlab-ci.yml | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c0fce25..a88f00d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,25 +10,7 @@ build-ws: stage: build script: - apt-get update - - apt-get install -y ros-melodic-libfranka python-catkin-tools libeigen3-dev - - apt-get install -y build-essential - - apt-get install -y gcc - - apt-get install -y make - - apt-get install -y cmake - - apt-get install -y libssl-dev - - echo "source /opt/ros/melodic/setup.bash" >> ~/.bashrc - - source ~/.bashrc + - apt-get install -y ros-melodic-libfranka python-catkin-tools libeigen3-dev build-essential cmake libssl-dev + - source /opt/ros/melodic/setup.bash - rosdep install -y --from-paths . - - git clone https://github.com/eclipse/paho.mqtt.c.git - - cd paho.mqtt.c - - git checkout v1.3.1 - - cmake -Bbuild -H. -DPAHO_WITH_SSL=ON -DPAHO_ENABLE_TESTING=OFF - - cmake --build build/ --target install - - ldconfig - - cd .. - - git clone https://github.com/eclipse/paho.mqtt.cpp - - cd paho.mqtt.cpp - - cmake -Bbuild -H. -DPAHO_BUILD_DOCUMENTATION=FALSE -DPAHO_BUILD_SAMPLES=FALSE -DPAHO_BUILD_SAMPLES=FALSE - - cmake --build build/ --target install - - ldconfig - catkin build -- GitLab