feat: Drop Foxy support (#49)

Tiryoh · Jun 28, 2023 · a2b0222 · a2b0222
1 parent adfb49f
commit a2b0222
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 52 deletions.
diff --git a/.github/workflows/eol-installers.yml b/.github/workflows/eol-installers.yml
@@ -6,6 +6,7 @@ on:
     paths:
       - "ros2-dashing-**.sh"
       - "ros2-eloquent-**.sh"
+      - "ros2-foxy-**.sh"
       - "ros2-galactic-**.sh"
       - ".github/workflows/eol-installers.yml"
   pull_request:
@@ -14,6 +15,7 @@ on:
     paths:
       - "ros2-dashing-**.sh"
       - "ros2-eloquent-**.sh"
+      - "ros2-foxy-**.sh"
       - "ros2-galactic-**.sh"
       - ".github/workflows/eol-installers.yml"
   schedule:
@@ -30,6 +32,16 @@ jobs:
   #       run: |
   #         ./.test/bats/bin/bats ./.test/test-os-check-bionic.bats
 
+  os-check-on-ubuntu-focal:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - name: Run bats test
+        run: |
+          ./.test/bats/bin/bats ./.test/test-os-check-focal.bats
+
   # dashing-ros-base-main:
   #   runs-on: ubuntu-18.04
   #   steps:
@@ -82,6 +94,31 @@ jobs:
   #         sed -e 's/^\(ROS_DISTRO=.*\)/#\1\nROS_DISTRO=eloquent/g' -i tutorial.sh
   #         bash <(head -n -2 ./tutorial.sh)
 
+  foxy-ros-base-main:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run the install script
+        run: |
+          ./ros2-foxy-ros-base-main.sh
+      - name: Run the test script
+        run: |
+          sed -e 's/^\(ROS_DISTRO=.*\)/#\1\nROS_DISTRO=foxy/g' -i tutorial.sh
+          sed -e 's/^\(source \/opt.*bash\)$/\1\nrosdep install -r -y -i --from-paths ./g' -i tutorial.sh
+          bash <(head -n -2 ./tutorial.sh)
+
+  foxy-desktop-main:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run the install script
+        run: |
+          ./ros2-foxy-desktop-main.sh
+      - name: Run the test script
+        run: |
+          sed -e 's/^\(ROS_DISTRO=.*\)/#\1\nROS_DISTRO=foxy/g' -i tutorial.sh
+          bash <(head -n -2 ./tutorial.sh)
+
   galactic-ros-base-main:
     runs-on: ubuntu-20.04
     steps:

diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml
@@ -4,30 +4,18 @@ on:
     branches:
       - main
     paths:
-      - "ros2-foxy-**.sh"
       - "ros2-humble-**.sh"
       - ".github/workflows/installers.yml"
   pull_request:
     branches:
       - main
     paths:
-      - "ros2-foxy-**.sh"
       - "ros2-humble-**.sh"
       - ".github/workflows/installers.yml"
   schedule:
     - cron: "0 1 * * 1"
 
 jobs:
-  os-check-on-ubuntu-focal:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - name: Run bats test
-        run: |
-          ./.test/bats/bin/bats ./.test/test-os-check-focal.bats
-
   os-check-on-ubuntu-jammy:
     runs-on: ubuntu-22.04
     steps:
@@ -38,31 +26,6 @@ jobs:
         run: |
           ./.test/bats/bin/bats ./.test/test-os-check-jammy.bats
 
-  foxy-ros-base-main:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-      - name: Run the install script
-        run: |
-          ./ros2-foxy-ros-base-main.sh
-      - name: Run the test script
-        run: |
-          sed -e 's/^\(ROS_DISTRO=.*\)/#\1\nROS_DISTRO=foxy/g' -i tutorial.sh
-          sed -e 's/^\(source \/opt.*bash\)$/\1\nrosdep install -r -y -i --from-paths ./g' -i tutorial.sh
-          bash <(head -n -2 ./tutorial.sh)
-
-  foxy-desktop-main:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-      - name: Run the install script
-        run: |
-          ./ros2-foxy-desktop-main.sh
-      - name: Run the test script
-        run: |
-          sed -e 's/^\(ROS_DISTRO=.*\)/#\1\nROS_DISTRO=foxy/g' -i tutorial.sh
-          bash <(head -n -2 ./tutorial.sh)
-
   humble-ros-base-main:
     runs-on: ubuntu-22.04
     steps:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,19 +18,6 @@ on:
     - cron: "0 1 * * 1"
 
 jobs:
-  foxy:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-      - name: Run the install script
-        run: |
-          sed -e 's/^\(CHOOSE_ROS_DISTRO=.*\)/#\1\nCHOOSE_ROS_DISTRO=foxy/g' -i run.sh
-          ./run.sh
-      - name: Run the test script
-        run: |
-          sed -e 's/^\(ROS_DISTRO=.*\)/#\1\nROS_DISTRO=foxy/g' -i tutorial.sh
-          bash <(head -n -2 ./tutorial.sh)
-
   humble:
     runs-on: ubuntu-22.04
     steps:

diff --git a/ros2-foxy-desktop-main.sh b/ros2-foxy-desktop-main.sh
@@ -51,7 +51,7 @@ sudo apt-get install -y python3-colcon-common-extensions
 sudo apt-get install -y python3-rosdep python3-vcstool # https://index.ros.org/doc/ros2/Installation/Linux-Development-Setup/
 [ -e /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
 grep -F "source /opt/ros/$CHOOSE_ROS_DISTRO/setup.bash" ~/.bashrc ||
 echo "source /opt/ros/$CHOOSE_ROS_DISTRO/setup.bash" >> ~/.bashrc
 grep -F "source /usr/share/colcon_argcomplete/hook/colcon-argcomplete.bash" ~/.bashrc ||

diff --git a/ros2-foxy-ros-base-main.sh b/ros2-foxy-ros-base-main.sh
@@ -51,7 +51,7 @@ sudo apt-get install -y python3-colcon-common-extensions
 sudo apt-get install -y python3-rosdep python3-vcstool # https://index.ros.org/doc/ros2/Installation/Linux-Development-Setup/
 [ -e /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
 grep -F "source /opt/ros/$CHOOSE_ROS_DISTRO/setup.bash" ~/.bashrc ||
 echo "source /opt/ros/$CHOOSE_ROS_DISTRO/setup.bash" >> ~/.bashrc
 grep -F "source /usr/share/colcon_argcomplete/hook/colcon-argcomplete.bash" ~/.bashrc ||