feat: ROS Melodic EOL (#22)

* feat: ROS Melodic EOL * docs: Update README
Tiryoh · Sep 3, 2023 · 2f55aa2 · 2f55aa2
1 parent 0821865
commit 2f55aa2
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 39 deletions.
diff --git a/.github/workflows/test-scripts-eol.yml b/.github/workflows/test-scripts-eol.yml
@@ -5,28 +5,47 @@ on:
       - master
     paths:
       - ".github/workflows/test-scripts-eol.yml"
-      - "**.sh"
+      - "ros-kinetic-**.sh"
+      - "ros-melodic-**.sh"
   pull_request:
     branches:
       - master
     paths:
       - ".github/workflows/test-scripts-eol.yml"
-      - "**.sh"
+      - "ros-kinetic-**.sh"
+      - "ros-melodic-**.sh"
   schedule:
     - cron: "5 1 * * 6" # Weekly on Saturdays at 01:05(GMT)
 
 jobs:
-  kinetic:
+  # kinetic:
+  #   runs-on: ubuntu-latest
+  #   container: ubuntu:xenial
+  #   strategy:
+  #     matrix:
+  #       package: [desktop, ros-base]
+  #   env:
+  #     ROS_DISTRO: kinetic
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #     - name: Test
+  #       run: |
+  #         apt-get update
+  #         DEBIAN_FRONTEND=noninteractive apt-get install -yq wget curl git build-essential vim sudo lsb-release locales bash-completion tzdata
+  #         ./ros-${ROS_DISTRO}-${{ matrix.package }}.sh
+
+  melodic:
     runs-on: ubuntu-latest
-    container: ubuntu:xenial
+    container: ubuntu:bionic
     strategy:
       matrix:
         package: [desktop, ros-base]
     env:
-      ROS_DISTRO: kinetic
+      ROS_DISTRO: melodic
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Test
         run: |
-          apt-get update && apt-get install -y sudo lsb-release
-          ./ros-${ROS_DISTRO}-${{ matrix.package }}.sh
+          apt-get update
+          DEBIAN_FRONTEND=noninteractive apt-get install -yq wget curl git build-essential vim sudo lsb-release locales bash-completion tzdata
+          ./ros-${ROS_DISTRO}-${{ matrix.package }}-main.sh
diff --git a/.github/workflows/test-scripts.yml b/.github/workflows/test-scripts.yml
@@ -5,31 +5,17 @@ on:
       - master
     paths:
       - ".github/workflows/test-scripts.yml"
-      - "**.sh"
+      - "ros-noetic-**.sh"
   pull_request:
     branches:
       - master
     paths:
       - ".github/workflows/test-scripts.yml"
-      - "**.sh"
+      - "ros-noetic-**.sh"
   schedule:
     - cron: "5 1 * * 6" # Weekly on Saturdays at 01:05(GMT)
 
 jobs:
-  melodic:
-    runs-on: ubuntu-18.04
-    strategy:
-      matrix:
-        package: [desktop, ros-base]
-        ros-repo: [main, testing]
-    env:
-      ROS_DISTRO: melodic
-    steps:
-      - uses: actions/checkout@v2
-      - name: Test
-        run: |
-          ./ros-${ROS_DISTRO}-${{ matrix.package }}-${{ matrix.ros-repo }}.sh
-
   noetic:
     runs-on: ubuntu-20.04
     strategy:
@@ -39,7 +25,7 @@ jobs:
     env:
       ROS_DISTRO: noetic
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Test
         run: |
           ./ros-${ROS_DISTRO}-${{ matrix.package }}-${{ matrix.ros-repo }}.sh
diff --git a/README.md b/README.md
@@ -11,30 +11,30 @@ ROS 2 Version: https://github.com/Tiryoh/ros2_setup_scripts_ubuntu
 
 Access https://u.ty0.jp for details.
 
-* Melodic
-  * To install `ros-melodic-ros-base`, run the following command after downloading this repository.
+* Noetic
+  * To install `ros-noetic-ros-base`, run the following command after downloading this repository.
 
     ```sh
-    ./ros-melodic-ros-base.sh
+    ./ros-noetic-ros-base.sh
     ``` 
 
-  * To install `ros-melodic-desktop-full`, run the following command after downloading this repository.
+  * To install `ros-noetic-desktop-full`, run the following command after downloading this repository.
 
     ```sh
-    ./ros-melodic-desktop.sh
+    ./ros-noetic-desktop.sh
     ``` 
 
-* Noetic
-  * To install `ros-noetic-ros-base`, run the following command after downloading this repository.
+* Melodic (EOL)
+  * To install `ros-melodic-ros-base`, run the following command after downloading this repository.
 
     ```sh
-    ./ros-noetic-ros-base.sh
+    ./ros-melodic-ros-base.sh
     ``` 
 
-  * To install `ros-noetic-desktop-full`, run the following command after downloading this repository.
+  * To install `ros-melodic-desktop-full`, run the following command after downloading this repository.
 
     ```sh
-    ./ros-noetic-desktop.sh
+    ./ros-melodic-desktop.sh
     ``` 
 
 * Kinetic (EOL)

diff --git a/ros-melodic-desktop-main.sh b/ros-melodic-desktop-main.sh
@@ -15,7 +15,7 @@ python --version 2>&1 | grep -q "2.7" || exit 1
 
 ls /etc/ros/rosdep/sources.list.d/20-default.list > /dev/null 2>&1 && sudo rm /etc/ros/rosdep/sources.list.d/20-default.list
 sudo rosdep init 
-rosdep update
+rosdep update --include-eol-distros # https://discourse.ros.org/t/rosdep-and-eol-distros/7640
 
 sudo apt install -y python-rosinstall python-rosinstall-generator python-wstool build-essential python-catkin-tools python3-vcstool
 

diff --git a/ros-melodic-desktop-testing.sh b/ros-melodic-desktop-testing.sh
@@ -15,7 +15,7 @@ python --version 2>&1 | grep -q "2.7" || exit 1
 
 ls /etc/ros/rosdep/sources.list.d/20-default.list > /dev/null 2>&1 && sudo rm /etc/ros/rosdep/sources.list.d/20-default.list
 sudo rosdep init 
-rosdep update
+rosdep update --include-eol-distros # https://discourse.ros.org/t/rosdep-and-eol-distros/7640
 
 sudo apt install -y python-rosinstall python-rosinstall-generator python-wstool build-essential python-catkin-tools python3-vcstool
 

diff --git a/ros-melodic-ros-base-main.sh b/ros-melodic-ros-base-main.sh
@@ -15,7 +15,7 @@ python --version 2>&1 | grep -q "2.7" || exit 1
 
 ls /etc/ros/rosdep/sources.list.d/20-default.list > /dev/null 2>&1 && sudo rm /etc/ros/rosdep/sources.list.d/20-default.list
 sudo rosdep init 
-rosdep update
+rosdep update --include-eol-distros # https://discourse.ros.org/t/rosdep-and-eol-distros/7640
 
 sudo apt install -y python-rosinstall python-rosinstall-generator python-wstool build-essential python-catkin-tools python3-vcstool
 

diff --git a/ros-melodic-ros-base-testing.sh b/ros-melodic-ros-base-testing.sh
@@ -15,7 +15,7 @@ python --version 2>&1 | grep -q "2.7" || exit 1
 
 ls /etc/ros/rosdep/sources.list.d/20-default.list > /dev/null 2>&1 && sudo rm /etc/ros/rosdep/sources.list.d/20-default.list
 sudo rosdep init 
-rosdep update
+rosdep update --include-eol-distros # https://discourse.ros.org/t/rosdep-and-eol-distros/7640
 
 sudo apt install -y python-rosinstall python-rosinstall-generator python-wstool build-essential python-catkin-tools python3-vcstool