From 81b97768844c06921e4460ca81978396f54fa881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Tue, 19 Nov 2024 15:05:34 +0100 Subject: [PATCH 1/2] Mark iron EOL and remove it from workflows (#344) * Mark iron EOL and remove it from workflows * Update getting_started.rst --- .github/dependabot.yml | 2 +- .github/workflows/sphinx-check-links.yml | 2 +- .github/workflows/sphinx-check-page-multiversion.yml | 1 - .github/workflows/sphinx-check-warnings.yml | 2 +- conf.py | 4 ++-- doc/getting_started/getting_started.rst | 8 ++++---- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index aafd67c2369..3506a3c098a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -24,4 +24,4 @@ updates: directory: "/" schedule: interval: "weekly" - target-branch: "iron" + target-branch: "jazzy" diff --git a/.github/workflows/sphinx-check-links.yml b/.github/workflows/sphinx-check-links.yml index 3769d0aa1a8..9cce492d96b 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, iron, jazzy, rolling] + BRANCH: [humble, jazzy, 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 4898efc998e..c8b37bf3e72 100644 --- a/.github/workflows/sphinx-check-page-multiversion.yml +++ b/.github/workflows/sphinx-check-page-multiversion.yml @@ -9,7 +9,6 @@ on: type: choice options: - humble - - iron - jazzy - rolling pull_request: diff --git a/.github/workflows/sphinx-check-warnings.yml b/.github/workflows/sphinx-check-warnings.yml index 0230ac7f84f..54ecb487e64 100644 --- a/.github/workflows/sphinx-check-warnings.yml +++ b/.github/workflows/sphinx-check-warnings.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - BRANCH: [humble, iron, jazzy, rolling] + BRANCH: [humble, jazzy, rolling] steps: - uses: actions/checkout@v4 with: diff --git a/conf.py b/conf.py index 62b3d54ee0f..6f2c114e0d9 100644 --- a/conf.py +++ b/conf.py @@ -213,8 +213,8 @@ smv_branch_whitelist = r"^(foxy|galactic|humble|iron|jazzy|"+ base_branch + r")$" smv_released_pattern = r"^refs/(heads|remotes/[^/]+)/(foxy|galactic|humble|iron).*$" smv_remote_whitelist = r"^(origin)$" -smv_latest_version = "iron" -smv_eol_versions = ["foxy", "galactic"] +smv_latest_version = "jazzy" +smv_eol_versions = ["foxy", "galactic", "iron"] distro_full_names = { "foxy": "Foxy Fitzroy", diff --git a/doc/getting_started/getting_started.rst b/doc/getting_started/getting_started.rst index b292ad0aa85..864c374ded9 100644 --- a/doc/getting_started/getting_started.rst +++ b/doc/getting_started/getting_started.rst @@ -15,16 +15,16 @@ To use it, you have to install ``ros-{DISTRO}-ros2-control`` and ``ros-{DISTRO}- Building from Source --------------------------- -The rolling branch is compatible with both Humble and Iron ROS distributions. You can find more information about this compatibility on the respective `Humble `__ and `Iron `__ versions of this page. +The rolling branch is compatible with both Humble and Jazzy ROS distributions. You can find more information about this compatibility on the respective `Humble `__ and `Jazzy `__ versions of this page. .. raw:: html {DISTRO} Binary Build
- - Rolling Compatibility iron + + Rolling Compatibility Jazzy - Rolling Compatibility humble + Rolling Compatibility Humble If you want to install the framework from source, e.g., for contributing to the framework, use the following commands: From 412da355db1c514bb17fc7234c241d64db0c48b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Fr=C3=B6hlich?= Date: Sun, 24 Nov 2024 19:20:51 +0100 Subject: [PATCH 2/2] Fix badges in README (#354) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 479a36a51c9..e2e7b4b6cee 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Status [![Build & Deploy Page](https://github.com/ros-controls/control.ros.org/actions/workflows/sphinx-make-page.yml/badge.svg)](https://github.com/ros-controls/control.ros.org/actions/workflows/sphinx-make-page.yml) -[![Broken Links](https://github.com/ros-controls/control.ros.org/actions/workflows/sphinx-check-links.yml/badge.svg?branch=master)](https://github.com/ros-controls/control.ros.org/actions/workflows/sphinx-check-links.yml) -[![Sphinx Warnings](https://github.com/ros-controls/control.ros.org/actions/workflows/sphinx-check-warnings.yml/badge.svg?branch=master)](https://github.com/ros-controls/control.ros.org/actions/workflows/sphinx-check-warnings.yml) +[![Broken Links](https://github.com/ros-controls/control.ros.org/actions/workflows/sphinx-check-links.yml/badge.svg?branch=rolling)](https://github.com/ros-controls/control.ros.org/actions/workflows/sphinx-check-links.yml) +[![Sphinx Warnings](https://github.com/ros-controls/control.ros.org/actions/workflows/sphinx-check-warnings.yml/badge.svg?branch=rolling)](https://github.com/ros-controls/control.ros.org/actions/workflows/sphinx-check-warnings.yml) # control.ros.org https://control.ros.org/