Skip to content

Add Kilted Kaiju (and update jazzy branches) #443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: rolling
Choose a base branch
from
Draft
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
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,10 @@ updates:
schedule:
interval: "weekly"
target-branch: "jazzy"
- package-ecosystem: "github-actions"
# Workflow files stored in the
# default location of `.github/workflows`
directory: "/"
schedule:
interval: "weekly"
target-branch: "kilted"
2 changes: 1 addition & 1 deletion .github/workflows/sphinx-check-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
BRANCH: [humble, jazzy, rolling]
BRANCH: [humble, jazzy, kilted, rolling]
steps:
- uses: actions/checkout@v4
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/sphinx-check-page-multiversion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
options:
- humble
- jazzy
- kilted
- rolling
pull_request:
branches:
Expand Down
7 changes: 5 additions & 2 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
base_branch = "rolling"

# Add branches you want to whitelist here.
smv_branch_whitelist = r"^(foxy|galactic|humble|iron|jazzy|"+ base_branch + r")$"
smv_branch_whitelist = r"^(foxy|galactic|humble|iron|jazzy|kilted|"+ base_branch + r")$"
smv_released_pattern = r"^refs/(heads|remotes/[^/]+)/(foxy|galactic|humble|iron|jazzy).*$"
smv_remote_whitelist = r"^(origin)$"
smv_latest_version = "jazzy"
Expand All @@ -225,6 +225,7 @@
"humble": "Humble Hawksbill",
"iron": "Iron Irwini",
"jazzy": "Jazzy Jalisco",
"kilted": "Kilted Kaiju",
"rolling": "Rolling Ridley",
}

Expand Down Expand Up @@ -343,6 +344,7 @@ def smv_rewrite_configs(app, config):
# this map is used to match branches of control.ros.org to ROS distros, e.g., DISTRO macro
branch_distro = {
base_branch: "rolling",
"kilted": "kilted",
"jazzy": "jazzy",
"iron": "iron",
"humble": "humble",
Expand All @@ -352,7 +354,8 @@ def smv_rewrite_configs(app, config):
# this map is used to match branches of control.ros.org to REPOS_FILE_BRANCH macro
subrepo_branch = {
base_branch: "master",
"jazzy": "master",
"kilted": "master",
"jazzy": "jazzy",
"iron": "iron",
"humble": "humble",
"foxy": "foxy",
Expand Down
19 changes: 14 additions & 5 deletions make_help_scripts/deploy_defines.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ def add_pr_stats_file():
"humble": "humble",
"iron": "iron",
"jazzy": "jazzy",
"kilted": "kilted",
base_branch: "rolling" # PRs are tested on rolling
}

Expand All @@ -78,7 +79,8 @@ def add_pr_stats_file():
"galactic": "galactic",
"humble": "humble",
"iron": "iron",
"jazzy": "master",
"jazzy": "jazzy",
"kilted": "master",
"rolling": "master"
},
"pr": os.environ.get('ROS2_CONTROL_PR')
Expand All @@ -90,7 +92,8 @@ def add_pr_stats_file():
"galactic": "galactic",
"humble": "humble",
"iron": "iron",
"jazzy": "master",
"jazzy": "jazzy",
"kilted": "master",
"rolling": "master"
},
"pr": os.environ.get('ROS2_CONTROLLERS_PR')
Expand All @@ -103,6 +106,7 @@ def add_pr_stats_file():
"humble": "humble",
"iron": "iron",
"jazzy": "master",
"kilted": "master",
"rolling": "master"
},
"pr": os.environ.get('ROS2_CONTROL_DEMOS_PR')
Expand All @@ -125,6 +129,7 @@ def add_pr_stats_file():
"humble": "humble",
"iron": "iron",
"jazzy": "jazzy",
"kilted": "kilted",
"rolling": "rolling"
},
"pr": os.environ.get('GZ_ROS2_CONTROL_PR')
Expand All @@ -136,7 +141,8 @@ def add_pr_stats_file():
"galactic": "humble",
"humble": "humble",
"iron": "ros2-master",
"jazzy": "ros2-master",
"jazzy": "jazzy",
"kilted": "ros2-master",
"rolling": "ros2-master"
},
"pr": None
Expand All @@ -148,7 +154,8 @@ def add_pr_stats_file():
"galactic": "galactic-devel",
"humble": "humble",
"iron": "master",
"jazzy": "master",
"jazzy": "jazzy",
"kilted": "master",
"rolling": "master"
},
"pr": None
Expand All @@ -161,6 +168,7 @@ def add_pr_stats_file():
"humble": "humble",
"iron": "jazzy",
"jazzy": "jazzy",
"kilted": "master",
"rolling": "master"
},
"pr": None
Expand All @@ -172,7 +180,8 @@ def add_pr_stats_file():
"galactic": "humble",
"humble": "humble",
"iron": "master",
"jazzy": "master",
"jazzy": "jazzy",
"kilted": "master",
"rolling": "master"
},
"pr": None
Expand Down
Loading