From bb3a5d2886c1319ad4ae911f173e823ecaaeb280 Mon Sep 17 00:00:00 2001 From: Miguel Prada <miguel.prada@tecnalia.com> Date: Thu, 22 May 2025 12:22:49 +0200 Subject: [PATCH] Adds ROS 2 rolling distro support --- ci-templates/auto-rules/no-default.yml | 15 +++++++++++++++ ci-templates/auto-rules/rolling-default.yml | 4 ++++ .../with-rosinstall/rolling-default.yml | 4 ++++ 3 files changed, 23 insertions(+) create mode 100644 ci-templates/auto-rules/rolling-default.yml create mode 100644 ci-templates/auto-rules/with-rosinstall/rolling-default.yml diff --git a/ci-templates/auto-rules/no-default.yml b/ci-templates/auto-rules/no-default.yml index 2bef990..5b16114 100644 --- a/ci-templates/auto-rules/no-default.yml +++ b/ci-templates/auto-rules/no-default.yml @@ -17,6 +17,9 @@ workflow: - if: $CI_COMMIT_REF_NAME =~ /^jazzy-.*/ variables: DEFAULT_DISTRO: "jazzy" + - if: $CI_COMMIT_REF_NAME =~ /^rolling-.*/ + variables: + DEFAULT_DISTRO: "rolling" - if: $CI_COMMIT_TAG - if: $CI_COMMIT_BRANCH @@ -60,6 +63,14 @@ industrial_ci_jazzy: - if: $DEFAULT_DISTRO == "jazzy" - if: $BUILD_JAZZY +industrial_ci_rolling: + extends: .industrial_ci + variables: + ROS_DISTRO: rolling + rules: + - if: $DEFAULT_DISTRO == "rolling" + - if: $BUILD_ROLLING + .py3_rules: rules: - if: $DEFAULT_DISTRO == "noetic" @@ -74,6 +85,10 @@ industrial_ci_jazzy: when: always - if: $BUILD_JAZZY when: always + - if: $DEFAULT_DISTRO == "rolling" + when: always + - if: $BUILD_ROLLING + when: always py3-flake8: extends: diff --git a/ci-templates/auto-rules/rolling-default.yml b/ci-templates/auto-rules/rolling-default.yml new file mode 100644 index 0000000..9e2bf8b --- /dev/null +++ b/ci-templates/auto-rules/rolling-default.yml @@ -0,0 +1,4 @@ +include: ci-templates/auto-rules/no-default.yml + +variables: + DEFAULT_DISTRO: rolling diff --git a/ci-templates/auto-rules/with-rosinstall/rolling-default.yml b/ci-templates/auto-rules/with-rosinstall/rolling-default.yml new file mode 100644 index 0000000..0ccc573 --- /dev/null +++ b/ci-templates/auto-rules/with-rosinstall/rolling-default.yml @@ -0,0 +1,4 @@ +include: ci-templates/auto-rules/with-rosinstall/no-default.yml + +variables: + DEFAULT_DISTRO: rolling -- GitLab