From 2727935ef42d94a163e7688236e24b950535e927 Mon Sep 17 00:00:00 2001
From: Christoph Froehlich <christoph.froehlich@ait.ac.at>
Date: Fri, 18 Apr 2025 14:36:26 +0000
Subject: [PATCH] Add kilted (and update jazzy branches)

---
 .github/dependabot.yml                        |  7 +++++++
 .github/workflows/sphinx-check-links.yml      |  2 +-
 .../sphinx-check-page-multiversion.yml        |  1 +
 conf.py                                       |  7 +++++--
 make_help_scripts/deploy_defines.py           | 19 ++++++++++++++-----
 5 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 3506a3c098a..f89baba15b4 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -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"
diff --git a/.github/workflows/sphinx-check-links.yml b/.github/workflows/sphinx-check-links.yml
index 9cce492d96b..c0e3c83e528 100644
--- a/.github/workflows/sphinx-check-links.yml
+++ b/.github/workflows/sphinx-check-links.yml
@@ -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:
diff --git a/.github/workflows/sphinx-check-page-multiversion.yml b/.github/workflows/sphinx-check-page-multiversion.yml
index c8b37bf3e72..6f6b06c42cf 100644
--- a/.github/workflows/sphinx-check-page-multiversion.yml
+++ b/.github/workflows/sphinx-check-page-multiversion.yml
@@ -10,6 +10,7 @@ on:
         options:
         - humble
         - jazzy
+        - kilted
         - rolling
   pull_request:
     branches:
diff --git a/conf.py b/conf.py
index b4a923d4a43..9c91ea1b5f4 100644
--- a/conf.py
+++ b/conf.py
@@ -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"
@@ -225,6 +225,7 @@
     "humble": "Humble Hawksbill",
     "iron": "Iron Irwini",
     "jazzy": "Jazzy Jalisco",
+    "kilted": "Kilted Kaiju",
     "rolling": "Rolling Ridley",
 }
 
@@ -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",
@@ -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",
diff --git a/make_help_scripts/deploy_defines.py b/make_help_scripts/deploy_defines.py
index 31e9df1b757..a6746d1a4c9 100644
--- a/make_help_scripts/deploy_defines.py
+++ b/make_help_scripts/deploy_defines.py
@@ -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
 }
 
@@ -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')
@@ -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')
@@ -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')
@@ -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')
@@ -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
@@ -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
@@ -161,6 +168,7 @@ def add_pr_stats_file():
             "humble": "humble",
             "iron": "jazzy",
             "jazzy": "jazzy",
+            "kilted": "master",
             "rolling": "master"
         },
         "pr": None
@@ -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