From ddd2016c73c42727fa28e7b8d69f6c84da60f486 Mon Sep 17 00:00:00 2001
From: Miguel Prada <miguel.prada@tecnalia.com>
Date: Mon, 2 Dec 2019 18:21:43 +0100
Subject: [PATCH] Point to master branch when retrieving clang-format config
---
.gitlab-industrial-ci-kinetic-no-rosinstall.yml | 2 +-
.gitlab-industrial-ci-kinetic-with-rosinstall.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index bde67fe..5da3654 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -21,7 +21,7 @@ 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
+ - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/clang-format -O .clang-format
script: .ci_config/gitlab.sh
variables:
ADDITIONAL_DEBS: curl
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index f213962..060c903 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -21,7 +21,7 @@ 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
+ - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/clang-format -O .clang-format
script: .ci_config/gitlab.sh
variables:
ADDITIONAL_DEBS: curl
--
GitLab