Merge branch 'main' into hidmic/no-weekly-ci-in-forks

Ekumen-OS · Dec 20, 2024 · 902f9aa · 902f9aa
2 parents b09041c + b2748e4
commit 902f9aa
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 128 deletions.
diff --git a/.github/workflows/ci_pipeline.yml b/.github/workflows/ci_pipeline.yml
@@ -37,7 +37,6 @@ jobs:
         ros_distro:
           - noetic
           - humble
-          - iron
           - jazzy
         include:
           - ros_distro: humble

diff --git a/.github/workflows/docker_ci_pipeline.yml b/.github/workflows/docker_ci_pipeline.yml
@@ -24,7 +24,6 @@ jobs:
         ros_distro:
           - noetic
           - humble
-          - iron
           - jazzy
           - rolling
     steps:

diff --git a/.github/workflows/weekly_pipeline.yml b/.github/workflows/weekly_pipeline.yml
@@ -24,7 +24,6 @@ jobs:
         ros_distro:
           - noetic
           - humble
-          - iron
           - jazzy
           - rolling
     container:

diff --git a/DEVELOPING.md b/DEVELOPING.md
@@ -38,7 +38,7 @@ To bring up a development environment:
    (cd beluga && ROSDISTRO=humble docker/run.sh)
    ```
 
-   Supported distributions include `noetic`, `humble`, `iron`, `jazzy`, and `rolling`.
+   Supported distributions include `noetic`, `humble`, `jazzy`, and `rolling`.
 
 ## Workflow
 

diff --git a/beluga_tools/package.xml b/beluga_tools/package.xml
@@ -11,12 +11,12 @@
   <license>Apache License 2.0</license>
 
 
-  <!-- The released debian for h5py package when on humble or iron seems to have a bug where it's incompatible with numpy's 2.0.0 version.
+  <!-- The released debian for h5py package when on humble seems to have a bug where it's incompatible with numpy's 2.0.0 version.
   We will install newest package version using pip in the development images to circumvent this..
   See:
   https://github.com/h5py/h5py/issues/2353
   -->
-  <exec_depend condition="$ROS_VERSION == 2 and $ROS_DISTRO != 'humble' and $ROS_DISTRO != 'iron'">python3-h5py</exec_depend>
+  <exec_depend condition="$ROS_VERSION == 2 and $ROS_DISTRO != 'humble'">python3-h5py</exec_depend>
   <exec_depend condition="$ROS_VERSION == 2">python3-matplotlib</exec_depend>
   <exec_depend condition="$ROS_VERSION == 2">python3-numpy</exec_depend>
   <exec_depend condition="$ROS_VERSION == 2">python3-scipy</exec_depend>

diff --git a/docker/files/iron.repos b/docker/files/iron.repos
diff --git a/docker/images/iron/Dockerfile b/docker/images/iron/Dockerfile
diff --git a/docs/_images/iron_irwini_logo.jpg b/docs/_images/iron_irwini_logo.jpg
diff --git a/docs/index.md b/docs/index.md
@@ -143,10 +143,6 @@ Beluga is supported on a number of ROS 1 and ROS 2 distributions, primarily on L
 :text-align: center
 ![ROS 2 Humble Hawksbill logo](./_images/humble_hawksbill_logo.png)
 :::
-:::{grid-item-card} ROS 2 Iron Irwini
-:text-align: center
-![ROS 2 Iron Irwini logo](./_images/iron_irwini_logo.jpg)
-:::
 :::{grid-item-card} ROS 2 Jazzy Jalisco
 :text-align: center
 ![ROS 2 Jazzy Jalisco logo](./_images/jazzy_jalisco_logo.png)
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,7 +37,6 @@ jobs: @@
             ros_distro:
               - noetic
               - humble
-              - iron
               - jazzy
             include:
               - ros_distro: humble
@@ Expand Down @@