Skip to content
GitLab
Commit dc90b463 authored by Prada Sarasola, Miguel's avatar Prada Sarasola, Miguel
Browse files

Make clang_format job not to extend .industrial_ci

parent 7692a7a0
Hide whitespace changes
Inline Side-by-side
.gitlab-industrial-ci-kinetic-no-rosinstall.yml
View file @ dc90b463
...@@ -18,10 +18,9 @@ before_script: ...@@ -18,10 +18,9 @@ before_script:
.industrial_ci: .industrial_ci:
stage: build stage: build
before_script: before_script:
- apk add --update bash coreutils tar wget - 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/master/clang-format -O .clang-format
script: .ci_config/gitlab.sh script: .ci_config/gitlab.sh
variables: variables:
ADDITIONAL_DEBS: curl ADDITIONAL_DEBS: curl
...@@ -77,12 +76,19 @@ industrial_ci_kinetic_deploy: ...@@ -77,12 +76,19 @@ industrial_ci_kinetic_deploy:
- tags - tags
clang_format: clang_format:
extends: .industrial_ci
stage: postcheck stage: postcheck
before_script:
- apk add --update bash coreutils tar wget
- git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy
- wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/clang-format -O .clang-format
script: .ci_config/gitlab.sh
variables: variables:
ROS_DISTRO: kinetic ROS_DISTRO: kinetic
CLANG_FORMAT_CHECK: file CLANG_FORMAT_CHECK: file
CLANG_FORMAT_VERSION: "3.8" CLANG_FORMAT_VERSION: "3.8"
when: always
tags:
- docker
allow_failure: yes allow_failure: yes
########################################################## ##########################################################
......
.gitlab-industrial-ci-kinetic-with-rosinstall.yml
View file @ dc90b463
...@@ -18,10 +18,9 @@ before_script: ...@@ -18,10 +18,9 @@ before_script:
.industrial_ci: .industrial_ci:
stage: build stage: build
before_script: before_script:
- apk add --update bash coreutils tar wget - 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/master/clang-format -O .clang-format
script: .ci_config/gitlab.sh script: .ci_config/gitlab.sh
variables: variables:
ADDITIONAL_DEBS: curl ADDITIONAL_DEBS: curl
...@@ -79,12 +78,19 @@ industrial_ci_kinetic_deploy: ...@@ -79,12 +78,19 @@ industrial_ci_kinetic_deploy:
- tags - tags
clang_format: clang_format:
extends: .industrial_ci
stage: postcheck stage: postcheck
before_script:
- apk add --update bash coreutils tar wget
- git clone --quiet --depth 1 https://github.com/ros-industrial/industrial_ci.git .ci_config -b legacy
- wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/clang-format -O .clang-format
script: .ci_config/gitlab.sh
variables: variables:
ROS_DISTRO: kinetic ROS_DISTRO: kinetic
CLANG_FORMAT_CHECK: file CLANG_FORMAT_CHECK: file
CLANG_FORMAT_VERSION: "3.8" CLANG_FORMAT_VERSION: "3.8"
when: always
tags:
- docker
allow_failure: yes allow_failure: yes
########################################################## ##########################################################
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment