Skip to content
Snippets Groups Projects
Commit 2b938dad authored by Jon Azpiazu's avatar Jon Azpiazu
Browse files

Fix the rules syntax

parent 16198fe5
No related branches found
No related tags found
No related merge requests found
Pipeline #48131 passed
...@@ -31,7 +31,6 @@ before_script: ...@@ -31,7 +31,6 @@ before_script:
ROSINSTALL_FILENAME: ".rosinstall" ROSINSTALL_FILENAME: ".rosinstall"
BEFORE_SCRIPT: "bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$CATKIN_WORKSPACE" BEFORE_SCRIPT: "bash <(curl -Ls https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/master/scripts/ci_run_entry_points.sh) $$CATKIN_WORKSPACE"
CATKIN_CONFIG: '--cmake-args -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context --' CATKIN_CONFIG: '--cmake-args -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context --'
when: always
tags: tags:
- docker - docker
...@@ -41,11 +40,11 @@ industrial_ci_kinetic: ...@@ -41,11 +40,11 @@ industrial_ci_kinetic:
ROS_DISTRO: kinetic ROS_DISTRO: kinetic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
rules: rules:
- if: '$CI_COMMIT_REF_NAME =~ /^melodic-.*/' - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
when: never when: never
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
when: never when: never
when: always - when: always
industrial_ci_melodic: industrial_ci_melodic:
extends: .industrial_ci extends: .industrial_ci
...@@ -53,7 +52,7 @@ industrial_ci_melodic: ...@@ -53,7 +52,7 @@ industrial_ci_melodic:
ROS_DISTRO: melodic ROS_DISTRO: melodic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}" DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
rules: rules:
- if: '$CI_COMMIT_REF_NAME =~ /^melodic-.*/' - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
when: always when: always
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
when: never when: never
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment