From 9f963f67ebb889792175776c5ee00134d7bb569b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20L=C3=BCdtke?= <727227+mathias-luedtke@users.noreply.github.com> Date: Wed, 5 Jul 2023 20:06:49 +0200 Subject: [PATCH] Mark ROS1 melodic as EOL --- .github/workflows/legacy.yml | 2 -- .github/workflows/main.yml | 2 -- doc/index.rst | 2 +- industrial_ci/src/ros.sh | 1 + 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/legacy.yml b/.github/workflows/legacy.yml index 8166399a4..bf3eb130a 100644 --- 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 index f63e0728f..224e96df3 100644 --- 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 index e91c601f8..37fa8ae6e 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -29,7 +29,7 @@ The following `ROS `__ / `ROS2 `__ *(EOL)* * `Kinetic `__ *(EOL)* * `Lunar `__ *(EOL)* -* `Melodic `__ +* `Melodic `__ *(EOL)* * `Noetic `__ * `Ardent `__ *(EOL)* * `Bouncy `__ *(EOL)* diff --git a/industrial_ci/src/ros.sh b/industrial_ci/src/ros.sh index d8cfc5d4d..4a6b27431 100644 --- 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"