Skip to content
Snippets Groups Projects

Resolve "Allow a way of testing melodic pipeline"

Merged Jon Azpiazu requested to merge 33-allow-a-way-of-testing-melodic-pipeline into master
2 unresolved threads
1 file
+ 3
4
Compare changes
  • Side-by-side
  • Inline
@@ -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
Loading