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

Extend possibility to pull scripts from custom branches to all scripts

in templates
parent 595257a5
No related branches found
No related tags found
No related merge requests found
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
ADDITIONAL_DEBS: curl ADDITIONAL_DEBS: curl
PARALLEL_BUILDS: 2 # keep this for now, since there seems to be memory limit issues in the ci VM PARALLEL_BUILDS: 2 # keep this for now, since there seems to be memory limit issues in the ci VM
AFTER_SETUP_TARGET_WORKSPACE: "rosenv && bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$current_ws" GITLAB_TEMPLATES_BRANCH: master
AFTER_SETUP_TARGET_WORKSPACE: "rosenv && bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/${GITLAB_TEMPLATES_BRANCH}/scripts/ci_run_entry_points.sh) $$current_ws"
CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context
......
...@@ -7,12 +7,13 @@ clang_format: ...@@ -7,12 +7,13 @@ clang_format:
before_script: before_script:
- apk add --update bash coreutils tar wget - apk add --update bash coreutils tar wget
- 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
- wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/clang-format -O .clang-format - wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/${GITLAB_TEMPLATES_BRANCH}/clang-format -O .clang-format
script: .ci_config/gitlab.sh 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"
GITLAB_TEMPLATES_BRANCH: master
when: always when: always
########################################################## ##########################################################
...@@ -77,8 +78,10 @@ file_syntax: ...@@ -77,8 +78,10 @@ file_syntax:
adoc_syntax: adoc_syntax:
stage: .post stage: .post
image: tecnalia-docker-dev.artifact.tecnalia.com/alpine image: tecnalia-docker-dev.artifact.tecnalia.com/alpine
variables:
GITLAB_TEMPLATES_BRANCH: master
before_script: before_script:
- apk add --update curl asciidoctor bash - apk add --update curl asciidoctor bash
script: script:
- curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/asciidoctor_syntax_check.bash | bash -s -- . - curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/${GITLAB_TEMPLATES_BRANCH}/scripts/asciidoctor_syntax_check.bash | bash -s -- .
when: always when: always
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment