Remove iron (#386)

Co-authored-by: Alejandro Hernández Cordero <[email protected]> (cherry picked from commit 2e242fb) # Conflicts: # README.md
ros-controls · Dec 10, 2024 · 74f5f27 · 74f5f27
1 parent 71f2dca
commit 74f5f27
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 90 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -18,10 +18,3 @@ updates:
     schedule:
       interval: "weekly"
     target-branch: "humble"
-  - package-ecosystem: "github-actions"
-    # Workflow files stored in the
-    # default location of `.github/workflows`
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    target-branch: "iron"
diff --git a/.github/workflows/ci-iron.yaml b/.github/workflows/ci-iron.yaml
diff --git a/README.md b/README.md
@@ -17,7 +17,12 @@ See the [documentation file](doc/index.rst) or [control.ros.org](https://control
 
 ROS 2 Distro | Branch | Build status | Documentation
 :----------: | :----: | :----------: | :-----------:
+<<<<<<< HEAD
 **Rolling** | [`master`](https://github.com/ros-controls/gazebo_ros2_control/tree/master) | n/a | [Documentation](https://control.ros.org/master/doc/gazebo_ros2_control/doc/index.html)
 **Jazzy** | [`master`](https://github.com/ros-controls/gazebo_ros2_control/tree/master) | n/a | [Documentation](https://control.ros.org/jazzy/doc/gazebo_ros2_control/doc/index.html)
 **Iron** | [`iron`](https://github.com/ros-controls/gazebo_ros2_control/tree/iron) | [![Gazebo ros2 control CI](https://github.com/ros-controls/gazebo_ros2_control/actions/workflows/ci-iron.yaml/badge.svg?branch=iron)](https://github.com/ros-controls/gazebo_ros2_control/actions/workflows/ci-iron.yaml) | [Documentation](https://control.ros.org/iron/doc/gazebo_ros2_control/doc/index.html)
+=======
+**Rolling** | [`master`](https://github.com/ros-controls/gazebo_ros2_control/tree/master) |  [![Gazebo ros2 control CI](https://github.com/ros-controls/gazebo_ros2_control/actions/workflows/ci-rolling.yaml/badge.svg?branch=master)](https://github.com/ros-controls/gazebo_ros2_control/actions/workflows/ci-rolling.yaml)  | [Documentation](https://control.ros.org/master/doc/gazebo_ros2_control/doc/index.html)
+**Jazzy** | [`master`](https://github.com/ros-controls/gazebo_ros2_control/tree/master) |  [![Gazebo ros2 control CI](https://github.com/ros-controls/gazebo_ros2_control/actions/workflows/ci-rolling.yaml/badge.svg?branch=master)](https://github.com/ros-controls/gazebo_ros2_control/actions/workflows/ci-rolling.yaml)  | [Documentation](https://control.ros.org/jazzy/doc/gazebo_ros2_control/doc/index.html)
+>>>>>>> 2e242fb (Remove iron (#386))
 **Humble** | [`humble`](https://github.com/ros-controls/gazebo_ros2_control/tree/humble) | [![Gazebo ros2 control CI](https://github.com/ros-controls/gazebo_ros2_control/actions/workflows/ci-humble.yaml/badge.svg?branch=humble)](https://github.com/ros-controls/gazebo_ros2_control/actions/workflows/ci-humble.yaml) | [Documentation](https://control.ros.org/humble/doc/gazebo_ros2_control/doc/index.html)