From dcfb9f91deb6d08f5ad0cb708695701f394ed703 Mon Sep 17 00:00:00 2001
From: Jon Azpiazu <jon.azpiazu@tecnalia.com>
Date: Fri, 14 Jul 2023 10:20:10 +0200
Subject: [PATCH] Move variable definition
---
ci-templates/industrial-ci-templates.yml | 3 +++
ci-templates/syntax-check.yml | 7 +++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ci-templates/industrial-ci-templates.yml b/ci-templates/industrial-ci-templates.yml
index 6dad8ca..0edde69 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 53bc403..2ebc800 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:
--
GitLab