diff --git a/ci-templates/industrial-ci-templates.yml b/ci-templates/industrial-ci-templates.yml index 6dad8ca78426e8a4838447a85fcda6c41cb11888..0edde69168d3094d9704bc21951eeb90931a82e1 100644 --- a/ci-templates/industrial-ci-templates.yml +++ b/ci-templates/industrial-ci-templates.yml @@ -1,3 +1,6 @@ +variables: + GITLAB_TEMPLATES_BRANCH: master + .industrial_ci: stage: build before_script: diff --git a/ci-templates/syntax-check.yml b/ci-templates/syntax-check.yml index 53bc4036469c6c7a1927aad012b9abee600481e0..2ebc80038b4e66ffee6238f105a6a91cc53baeb4 100644 --- a/ci-templates/syntax-check.yml +++ b/ci-templates/syntax-check.yml @@ -1,7 +1,9 @@ +variables: + GITLAB_TEMPLATES_BRANCH: master + ########################################################## ## Check formating of C and C++ files using clang-format ########################################################## - clang_format: stage: .post before_script: @@ -13,7 +15,6 @@ clang_format: ROS_DISTRO: kinetic CLANG_FORMAT_CHECK: file CLANG_FORMAT_VERSION: "3.8" - GITLAB_TEMPLATES_BRANCH: master when: always ########################################################## @@ -78,8 +79,6 @@ file_syntax: adoc_syntax: stage: .post image: tecnalia-docker-dev.artifact.tecnalia.com/alpine - variables: - GITLAB_TEMPLATES_BRANCH: master before_script: - apk add --update curl asciidoctor bash script: