From 2eefaad05303ac3246b6d1604d192768c80a7631 Mon Sep 17 00:00:00 2001 From: "danil.rivero" <danil.rivero@tecnalia.com> Date: Fri, 8 Sep 2023 10:56:03 +0200 Subject: [PATCH] Update auto rules with humble DISTRO --- ci-templates/auto-rules/humble-default.yml | 4 ++++ ci-templates/auto-rules/no-default.yml | 11 +++++++++++ .../auto-rules/with-rosinstall/humble-default.yml | 4 ++++ 3 files changed, 19 insertions(+) create mode 100644 ci-templates/auto-rules/humble-default.yml create mode 100644 ci-templates/auto-rules/with-rosinstall/humble-default.yml diff --git a/ci-templates/auto-rules/humble-default.yml b/ci-templates/auto-rules/humble-default.yml new file mode 100644 index 0000000..093c80e --- /dev/null +++ b/ci-templates/auto-rules/humble-default.yml @@ -0,0 +1,4 @@ +include: ci-templates/auto-rules/no-default.yml + +variables: + DEFAULT_DISTRO: humble diff --git a/ci-templates/auto-rules/no-default.yml b/ci-templates/auto-rules/no-default.yml index 011021a..9f8b432 100644 --- a/ci-templates/auto-rules/no-default.yml +++ b/ci-templates/auto-rules/no-default.yml @@ -11,6 +11,9 @@ workflow: - if: $CI_COMMIT_REF_NAME =~ /^noetic-.*/ variables: DEFAULT_DISTRO: "noetic" + - if: $CI_COMMIT_REF_NAME =~ /^humble-.*/ + variables: + DEFAULT_DISTRO: "humble" - if: $CI_COMMIT_TAG - if: $CI_COMMIT_BRANCH @@ -38,6 +41,14 @@ industrial_ci_noetic: - if: $DEFAULT_DISTRO == "noetic" - if: $BUILD_NOETIC +industrial_ci_humble: + extends: .industrial_ci + variables: + ROS_DISTRO: humble + rules: + - if: $DEFAULT_DISTRO == "humble" + - if: $BUILD_HUMBLE + ddeploy: extends: .ddeploy rules: diff --git a/ci-templates/auto-rules/with-rosinstall/humble-default.yml b/ci-templates/auto-rules/with-rosinstall/humble-default.yml new file mode 100644 index 0000000..98a639a --- /dev/null +++ b/ci-templates/auto-rules/with-rosinstall/humble-default.yml @@ -0,0 +1,4 @@ +include: ci-templates/auto-rules/with-rosinstall/no-default.yml + +variables: + DEFAULT_DISTRO: humble -- GitLab