From 2b938dad8b56dbc4fb13adba0bc408dc3c9d5792 Mon Sep 17 00:00:00 2001
From: Jon Azpiazu <jon.azpiazu@tecnalia.com>
Date: Mon, 10 May 2021 10:00:24 +0200
Subject: [PATCH] Fix the rules syntax
---
.gitlab-industrial-ci-kinetic-with-rosinstall.yml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index 227d32d..47e0864 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -31,7 +31,6 @@ before_script:
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"
CATKIN_CONFIG: '--cmake-args -DCMAKE_CXX_FLAGS=-Wno-ignored-attributes -Wno-int-in-bool-context --'
- when: always
tags:
- docker
@@ -41,11 +40,11 @@ industrial_ci_kinetic:
ROS_DISTRO: kinetic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
rules:
- - if: '$CI_COMMIT_REF_NAME =~ /^melodic-.*/'
+ - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
when: never
- if: $CI_COMMIT_TAG
when: never
- when: always
+ - when: always
industrial_ci_melodic:
extends: .industrial_ci
@@ -53,7 +52,7 @@ industrial_ci_melodic:
ROS_DISTRO: melodic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
rules:
- - if: '$CI_COMMIT_REF_NAME =~ /^melodic-.*/'
+ - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
when: always
- if: $CI_COMMIT_TAG
when: never
--
GitLab