Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
9 changes: 9 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 5 additions & 3 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}

Expand Down Expand Up @@ -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",
}
Expand Down