From 2c91fb23f3bc7c06dff3a9e7c876fad6edd33995 Mon Sep 17 00:00:00 2001 From: Felix Mauch Date: Wed, 3 Jul 2019 13:58:11 +0200 Subject: [PATCH] Revert "use gitlab-ci pipeline from https://gitlab.com/VictorLamoine/ros_gitlab_ci" This reverts commit 766fb8aaa53c8ca327115fc6e8d7cd5f5d5aae9e. --- .gitlab-ci.yml | 44 +++++++------------------------------------- 1 file changed, 7 insertions(+), 37 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b88217a..15537df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,38 +1,8 @@ -image: ros:kinetic-robot - -cache: - paths: - - ccache/ - -before_script: - - git clone https://gitlab.com/VictorLamoine/ros_gitlab_ci.git - - source ros_gitlab_ci/gitlab-ci.bash >/dev/null - -# catkin_lint -catkin lint: - tags: - - docker - stage: build - image: ros:kinetic-ros-core - before_script: - - apt update >/dev/null 2>&1 - - apt install -y python-catkin-lint >/dev/null 2>&1 - script: - - catkin_lint -W3 . - -# catkin_make -catkin_make: - tags: - - docker - stage: build - script: - - catkin_make - -catkin_make tests: - tags: - - docker - stage: test - script: - - catkin_make run_tests - - catkin_test_results # Check if one of the tests failed! +include: + - project: 'continuous_integration/ci_scripts' + ref: master + file: '/gitlab-ci-yml/catkin_pipeline.yml' +variables: + BUILD_INDIGO: "false" + BUILD_MELODIC: "false"