From 35d120f059cd1862e234963449cb50433a3ff0e2 Mon Sep 17 00:00:00 2001 From: Henning Kayser Date: Tue, 24 May 2022 15:10:12 +0200 Subject: [PATCH] Enable Humble Tutorial (#373) (cherry picked from commit 91f2f55b7a534e974d54911773ac99a903dd98aa) --- .github/ISSUE_TEMPLATE.md | 4 ++-- .github/mergify.yml | 9 +++++++++ conf.py | 8 +++++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 14158bc3a0..ac96ca7dd7 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -3,8 +3,8 @@ Overview of your issue here. ### Your environment -* ROS Distro: [Dashing|Eloquent|Foxy|Galactic|Rolling] -* OS Version: e.g. Ubuntu 20.04 +* ROS Distro: [Foxy|Galactic|Humble|Rolling] +* OS Version: e.g. Ubuntu 22.04 * Source or Binary build? * If binary, which release version? * If source, which git commit or tag? diff --git a/.github/mergify.yml b/.github/mergify.yml index 09611b512e..6ffc01d07c 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,4 +1,13 @@ pull_request_rules: + - name: backport to humble at reviewers discretion + conditions: + - base=main + - "label=backport-humble" + actions: + backport: + branches: + - humble + - name: backport to galactic at reviewers discretion conditions: - base=main diff --git a/conf.py b/conf.py index 5fcdf5e92a..61602f0709 100644 --- a/conf.py +++ b/conf.py @@ -126,16 +126,17 @@ # smv_tag_whitelist = None -smv_branch_whitelist = r"^(main|galactic|foxy)$" +smv_branch_whitelist = r"^(main|humble|galactic|foxy)$" -smv_released_pattern = r"^refs/(heads|remotes/[^/]+)/(foxy|galactic).*$" +smv_released_pattern = r"^refs/(heads|remotes/[^/]+)/(foxy|galactic|humble).*$" smv_remote_whitelist = r"^(origin)$" -smv_latest_version = "galactic" +smv_latest_version = "humble" smv_eol_versions = [] distro_full_names = { "foxy": "Foxy Fitzroy", "galactic": "Galactic Geochelone", + "humble": "Humble Hawksbill", "rolling": "Rolling Ridley", } @@ -409,6 +410,7 @@ def smv_rewrite_configs(app, config): if app.config.smv_current_version != "": branch_distro = { "main": "rolling", + "humble": "humble", "galactic": "galactic", "foxy": "foxy", }