Skip to content
Snippets Groups Projects
Commit 351e64be authored by Prada Sarasola, Miguel's avatar Prada Sarasola, Miguel
Browse files

Merge branch 'rolling-support' into 'master'

Adds ROS 2 rolling distro support

See merge request !101
parents d0d02ca2 be597345
No related branches found
No related tags found
1 merge request!101Adds ROS 2 rolling distro support
Pipeline #179480 passed
...@@ -17,6 +17,9 @@ workflow: ...@@ -17,6 +17,9 @@ workflow:
- if: $CI_COMMIT_REF_NAME =~ /^jazzy-.*/ - if: $CI_COMMIT_REF_NAME =~ /^jazzy-.*/
variables: variables:
DEFAULT_DISTRO: "jazzy" DEFAULT_DISTRO: "jazzy"
- if: $CI_COMMIT_REF_NAME =~ /^rolling-.*/
variables:
DEFAULT_DISTRO: "rolling"
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
- if: $CI_COMMIT_BRANCH - if: $CI_COMMIT_BRANCH
...@@ -60,6 +63,14 @@ industrial_ci_jazzy: ...@@ -60,6 +63,14 @@ industrial_ci_jazzy:
- if: $DEFAULT_DISTRO == "jazzy" - if: $DEFAULT_DISTRO == "jazzy"
- if: $BUILD_JAZZY - if: $BUILD_JAZZY
industrial_ci_rolling:
extends: .industrial_ci
variables:
ROS_DISTRO: rolling
rules:
- if: $DEFAULT_DISTRO == "rolling"
- if: $BUILD_ROLLING
.py3_rules: .py3_rules:
rules: rules:
- if: $DEFAULT_DISTRO == "noetic" - if: $DEFAULT_DISTRO == "noetic"
...@@ -74,6 +85,10 @@ industrial_ci_jazzy: ...@@ -74,6 +85,10 @@ industrial_ci_jazzy:
when: always when: always
- if: $BUILD_JAZZY - if: $BUILD_JAZZY
when: always when: always
- if: $DEFAULT_DISTRO == "rolling"
when: always
- if: $BUILD_ROLLING
when: always
py3-flake8: py3-flake8:
extends: extends:
......
include: ci-templates/auto-rules/no-default.yml
variables:
DEFAULT_DISTRO: rolling
include: ci-templates/auto-rules/with-rosinstall/no-default.yml
variables:
DEFAULT_DISTRO: rolling
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment