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/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index eb56d72932..3a849ce1d6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -6,6 +6,7 @@ on: push: branches: - main + - humble - galactic - foxy diff --git a/conf.py b/conf.py index 02d4163f3d..fa43ed8f54 100644 --- a/conf.py +++ b/conf.py @@ -129,16 +129,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", } @@ -404,6 +405,7 @@ def smv_rewrite_configs(app, config): if app.config.smv_current_version != "": branch_distro = { "main": "rolling", + "humble": "humble", "galactic": "galactic", "foxy": "foxy", }