Skip to content
Snippets Groups Projects
Commit 3d3e4d66 authored by Prada Sarasola, Miguel's avatar Prada Sarasola, Miguel
Browse files

Revert "Only clone clang-format config file in relevant job"

This reverts commit 71722772.
parent dd422494
Branches
No related tags found
1 merge request!40Resolve "Add clang format to the CI tests"
Pipeline #19034 passed
...@@ -21,6 +21,7 @@ before_script: ...@@ -21,6 +21,7 @@ before_script:
- apk add --update bash coreutils tar - apk add --update bash coreutils tar
- git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy - 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} - 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 script: .ci_config/gitlab.sh
variables: variables:
ADDITIONAL_DEBS: curl ADDITIONAL_DEBS: curl
...@@ -78,8 +79,6 @@ industrial_ci_kinetic_deploy: ...@@ -78,8 +79,6 @@ industrial_ci_kinetic_deploy:
clang_format: clang_format:
extends: .industrial_ci extends: .industrial_ci
stage: precheck stage: precheck
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: variables:
ROS_DISTRO: kinetic ROS_DISTRO: kinetic
CLANG_FORMAT_CHECK: file CLANG_FORMAT_CHECK: file
......
...@@ -21,6 +21,7 @@ before_script: ...@@ -21,6 +21,7 @@ before_script:
- apk add --update bash coreutils tar - apk add --update bash coreutils tar
- git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy - 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} - 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 script: .ci_config/gitlab.sh
variables: variables:
ADDITIONAL_DEBS: curl ADDITIONAL_DEBS: curl
...@@ -80,8 +81,6 @@ industrial_ci_kinetic_deploy: ...@@ -80,8 +81,6 @@ industrial_ci_kinetic_deploy:
clang_format: clang_format:
extends: .industrial_ci extends: .industrial_ci
stage: precheck stage: precheck
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: variables:
ROS_DISTRO: kinetic ROS_DISTRO: kinetic
CLANG_FORMAT_CHECK: file CLANG_FORMAT_CHECK: file
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment