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

Apply rules changes to no-rosinstall template

parent db544c84
No related branches found
No related tags found
No related merge requests found
Pipeline #48143 passed
...@@ -38,19 +38,22 @@ industrial_ci_kinetic: ...@@ -38,19 +38,22 @@ industrial_ci_kinetic:
variables: variables:
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}"
except: rules:
- tags - if: $CI_COMMIT_TAG
- /^melodic-.*/ when: never
- if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
when: never
- when: always
industrial_ci_melodic: industrial_ci_melodic:
extends: .industrial_ci extends: .industrial_ci
variables: variables:
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}"
only: rules:
- /melodic-.*/ - if: $CI_COMMIT_TAG
except: when: never
- tags - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
industrial_ci_kinetic_deploy: industrial_ci_kinetic_deploy:
extends: .industrial_ci extends: .industrial_ci
...@@ -73,8 +76,8 @@ industrial_ci_kinetic_deploy: ...@@ -73,8 +76,8 @@ industrial_ci_kinetic_deploy:
- docker build --build-arg APPLICATION_IMAGE=${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} -t ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev . - docker build --build-arg APPLICATION_IMAGE=${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} -t ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev .
- docker push ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev - docker push ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev
- cd .. - cd ..
only: rules:
- tags - if: $CI_COMMIT_TAG
clang_format: clang_format:
stage: postcheck stage: postcheck
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment