From 717227726d0bfaf3319385123e28316e021810a6 Mon Sep 17 00:00:00 2001
From: Miguel Prada <miguel.prada@tecnalia.com>
Date: Mon, 2 Dec 2019 18:01:05 +0100
Subject: [PATCH] Only clone clang-format config file in relevant job
---
.gitlab-industrial-ci-kinetic-no-rosinstall.yml | 3 ++-
.gitlab-industrial-ci-kinetic-with-rosinstall.yml | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index bde67fe..2aa4fc5 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -21,7 +21,6 @@ before_script:
- apk add --update bash coreutils tar
- git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy
- docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
- - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/13-add-clang-format-to-the-ci-tests/clang-format -O .clang-format
script: .ci_config/gitlab.sh
variables:
ADDITIONAL_DEBS: curl
@@ -79,6 +78,8 @@ industrial_ci_kinetic_deploy:
clang_format:
extends: .industrial_ci
stage: postcheck
+ before_script:
+ - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/13-add-clang-format-to-the-ci-tests/clang-format -O .clang-format
variables:
ROS_DISTRO: kinetic
CLANG_FORMAT_CHECK: file
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index f213962..077ef50 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -21,7 +21,6 @@ before_script:
- apk add --update bash coreutils tar
- git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy
- docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
- - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/13-add-clang-format-to-the-ci-tests/clang-format -O .clang-format
script: .ci_config/gitlab.sh
variables:
ADDITIONAL_DEBS: curl
@@ -81,6 +80,8 @@ industrial_ci_kinetic_deploy:
clang_format:
extends: .industrial_ci
stage: postcheck
+ before_script:
+ - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/13-add-clang-format-to-the-ci-tests/clang-format -O .clang-format
variables:
ROS_DISTRO: kinetic
CLANG_FORMAT_CHECK: file
--
GitLab