From 5d2f3f26908dd4a7b6fb924aaf4c9b159a72b442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1igo=20Moreno?= <inigo.moreno@tecnalia.com> Date: Wed, 22 Sep 2021 14:54:57 +0200 Subject: [PATCH] Move syntax to test --- ci-templates/core.yml | 1 + ci-templates/syntax-check.yml | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ci-templates/core.yml b/ci-templates/core.yml index 373591d..1651c6e 100644 --- a/ci-templates/core.yml +++ b/ci-templates/core.yml @@ -16,6 +16,7 @@ services: stages: - build + - test before_script: - apk add --update bash coreutils tar wget py-pip diff --git a/ci-templates/syntax-check.yml b/ci-templates/syntax-check.yml index ccf1df2..e39ae17 100644 --- a/ci-templates/syntax-check.yml +++ b/ci-templates/syntax-check.yml @@ -3,7 +3,7 @@ ########################################################## clang_format: - stage: .post + stage: test 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 @@ -33,7 +33,7 @@ python_syntax: bash_syntax: before_script: - apk add --update shellcheck - stage: .post + stage: test script: - RET=0 - find . -type f -name '*.sh' -exec shellcheck -s sh {} + || RET=1 @@ -49,7 +49,7 @@ bash_syntax: ## https://github.com/markdownlint/markdownlint/blob/master/docs/RULES.md ########################################################## markdown_syntax: - stage: .post + stage: test script: docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci syntax-markdown --path=/ac --extension=md --ignore=.ci_config --custom="-r ~MD013,~MD014" when: always @@ -60,7 +60,7 @@ markdown_syntax: ## Uses https://github.com/cytopia/awesome-ci ########################################################## file_syntax: - stage: .post + stage: test script: - RET=0 - docker run -v ${PWD}:/ac tecnalia-docker-dev.artifact.tecnalia.com/cytopia/awesome-ci file-trailing-space --path=/ac --extension=py,txt,cpp,h,md,sh,bash,xml,launch --ignore=.ci_config || RET=1 @@ -74,7 +74,7 @@ file_syntax: ## so this is a custom-made "dirty" script ########################################################## adoc_syntax: - stage: .post + stage: test image: tecnalia-docker-dev.artifact.tecnalia.com/alpine before_script: - apk add --update curl asciidoctor bash -- GitLab