Commit d2d14cc9 authored by Jon Azpiazu's avatar Jon Azpiazu
Browse files

Merge branch '34-noetic-support' into 'master'

Resolve "No noetic support"

Closes #34

See merge request !62
parents 4536c086 92da81d9
Pipeline #56196 failed with stage
in 10 seconds
...@@ -47,6 +47,8 @@ industrial_ci_kinetic: ...@@ -47,6 +47,8 @@ industrial_ci_kinetic:
when: never when: never
- if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/ - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
when: never when: never
- if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/
when: never
- when: always - when: always
industrial_ci_melodic: industrial_ci_melodic:
...@@ -59,6 +61,16 @@ industrial_ci_melodic: ...@@ -59,6 +61,16 @@ industrial_ci_melodic:
when: never when: never
- if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/ - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
industrial_ci_noetic:
extends: .industrial_ci
variables:
ROS_DISTRO: noetic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
rules:
- if: $CI_COMMIT_TAG
when: never
- if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/
industrial_ci_kinetic_deploy: industrial_ci_kinetic_deploy:
extends: .industrial_ci extends: .industrial_ci
variables: variables:
......
...@@ -49,6 +49,8 @@ industrial_ci_kinetic: ...@@ -49,6 +49,8 @@ industrial_ci_kinetic:
when: never when: never
- if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/ - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
when: never when: never
- if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/
when: never
- when: always - when: always
industrial_ci_melodic: industrial_ci_melodic:
...@@ -61,6 +63,16 @@ industrial_ci_melodic: ...@@ -61,6 +63,16 @@ industrial_ci_melodic:
when: never when: never
- if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/ - if: $CI_COMMIT_REF_NAME =~ /^melodic-.*/
industrial_ci_noetic:
extends: .industrial_ci
variables:
ROS_DISTRO: noetic
DOCKER_IMAGE: "${ARTIFACT_DOCKER_URL}/flexbotics-base-devel:${ROS_DISTRO}"
rules:
- if: $CI_COMMIT_TAG
when: never
- if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/
industrial_ci_kinetic_deploy: industrial_ci_kinetic_deploy:
extends: .industrial_ci extends: .industrial_ci
variables: variables:
......
Supports Markdown
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