A partir del 1 de octubre vamos a activar 2FA a todas las cuentas de esta instancia de Gitlab. No obstante, se recomienda activarlo cuanto antes para garantizar la seguridad de vuestra cuenta. Podeis hacerlo siguiendo las indicaciones del enlace.

As of October 1, we are going to enable 2FA to all accounts in this Gitlab instance. However, it is recommended to enable it as soon as possible to guarantee the security of your account. You can do it by following the instructions in the link.

https://docs.gitlab.com/ee/user/profile/account/two_factor_authentication.html#one-time-password

Commit d570e11f authored by Prada Sarasola, Miguel's avatar Prada Sarasola, Miguel
Browse files

Merge branch '33-allow-a-way-of-testing-melodic-pipeline' into 'master'

Resolve "Allow a way of testing melodic pipeline"

Closes #33

See merge request !60
parents ebed62aa 01f2ad7e
Pipeline #48166 passed with stage
in 15 seconds
......@@ -38,19 +38,22 @@ industrial_ci_kinetic:
variables:
ROS_DISTRO: kinetic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
except:
- tags
- melodic-devel
rules:
- if: $CI_COMMIT_TAG
when: never
- if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
when: never
- when: always
industrial_ci_melodic:
extends: .industrial_ci
variables:
ROS_DISTRO: melodic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
only:
- melodic-devel
except:
- tags
rules:
- if: $CI_COMMIT_TAG
when: never
- if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
industrial_ci_kinetic_deploy:
extends: .industrial_ci
......@@ -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 push ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev
- cd ..
only:
- tags
rules:
- if: $CI_COMMIT_TAG
clang_format:
stage: postcheck
......
......@@ -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
......@@ -40,19 +39,22 @@ industrial_ci_kinetic:
variables:
ROS_DISTRO: kinetic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
except:
- tags
- melodic-devel
rules:
- if: $CI_COMMIT_TAG
when: never
- if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
when: never
- when: always
industrial_ci_melodic:
extends: .industrial_ci
variables:
ROS_DISTRO: melodic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
only:
- melodic-devel
except:
- tags
rules:
- if: $CI_COMMIT_TAG
when: never
- if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
industrial_ci_kinetic_deploy:
extends: .industrial_ci
......@@ -75,8 +77,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 push ${ARTIFACT_DOCKER_URL}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}-dev
- cd ..
only:
- tags
rules:
- if: $CI_COMMIT_TAG
clang_format:
stage: postcheck
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment