Mark ROS1 melodic as EOL

ros-industrial · Jul 6, 2023 · 9f963f6 · 9f963f6
1 parent 1e0c5af
commit 9f963f6
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/.github/workflows/legacy.yml b/.github/workflows/legacy.yml
@@ -22,8 +22,6 @@ jobs:
       fail-fast: false
       matrix:
         env:
-          - {ROS_DISTRO: melodic, PRERELEASE: true}
-          - {ROS_DISTRO: melodic, ROS_REPO: ros}
           - {ROS_DISTRO: melodic}
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -85,8 +85,6 @@ jobs:
           - {ROS_DISTRO: melodic, ROS_REPO: ros, BUILDER: colcon, AFTER_SCRIPT: 'rosenv && [ "$$CMAKE_PREFIX_PATH" = "/root/target_ws/install/industrial_ci:/opt/ros/melodic" ]'}
           - {DOCKER_IMAGE: "ros:noetic", AFTER_INIT: "grep -r ros-testing /etc/apt && ici_exit 1 || ici_exit 2", EXPECT_EXIT_CODE: 2}
           - {DOCKER_IMAGE: "ros:noetic", ROS_REPO: testing, AFTER_INIT: "grep -r ros-testing /etc/apt && ici_exit 1 || ici_exit 2", EXPECT_EXIT_CODE: 1}
-          - {DOCKER_IMAGE: "ros:melodic", AFTER_INIT: "grep -r ros-testing /etc/apt && ici_exit 1 || ici_exit 2", EXPECT_EXIT_CODE: 2}
-          - {DOCKER_IMAGE: "ros:melodic", ROS_REPO: testing, AFTER_INIT: "grep -r ros-testing /etc/apt && ici_exit 1 || ici_exit 2", EXPECT_EXIT_CODE: 1}
           - {ROS_DISTRO: noetic, PRERELEASE: true}
           - {ROS_DISTRO: noetic, AFTER_SCRIPT: 'rosenv rosrun industrial_ci run_travis', ADDITIONAL_DEBS: "ros-noetic-rosbash"}
           - {ROS_DISTRO: foxy, AFTER_SCRIPT: 'rosenv ros2 run industrial_ci run_travis', ADDITIONAL_DEBS: "ros-foxy-ros2run"}

diff --git a/doc/index.rst b/doc/index.rst
@@ -29,7 +29,7 @@ The following `ROS <http://wiki.ros.org/Distributions>`__ / `ROS2 <https://index
 * `Jade <http://wiki.ros.org/jade>`__ *(EOL)*
 * `Kinetic <http://wiki.ros.org/kinetic>`__ *(EOL)*
 * `Lunar <http://wiki.ros.org/lunar>`__ *(EOL)*
-* `Melodic <http://wiki.ros.org/melodic>`__
+* `Melodic <http://wiki.ros.org/melodic>`__ *(EOL)*
 * `Noetic <http://wiki.ros.org/noetic>`__
 * `Ardent <https://index.ros.org/doc/ros2/Releases/Release-Ardent-Apalone/>`__ *(EOL)*
 * `Bouncy <https://index.ros.org/doc/ros2/Releases/Bouncy/>`__ *(EOL)*

diff --git a/industrial_ci/src/ros.sh b/industrial_ci/src/ros.sh
@@ -58,6 +58,7 @@ function _set_ros_defaults {
         ;;
     "melodic")
         _ros1_defaults "bionic"
+        _ros_is_eol "melodic/2023-06-27"
         ;;
     "noetic")
         _ros1_defaults "focal"