Ubuntu 24.04

.github/workflows/ubuntu_20_04.yml

@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  ubuntu2004and2204:
+  ubuntu2004:
     runs-on: ubuntu-20.04
     # env:
     steps:
@@ -19,30 +19,24 @@ jobs:
         run: |
           mkdir staging
           cd staging
-          sudo ../ros_from_src/dependencies.sh
+          mkdir -p underlay_ws/src
+          cp ../ros_from_src/*sh underlay_ws
+          sudo underlay_ws/dependencies.sh
 
       - name: local git dependencies
         run: |
           cd staging
+          cp ../ros_from_src/*yaml underlay_ws/src
+          sed -i 's/[email protected]:/https:\/\/github.com\//' underlay_ws/src/underlay_repos.yaml
           # override rosconsole in 20.04 for log4cxx compatibility
-          ROSCONSOLE=https://github.com/ros/rosconsole ../ros_from_src/git_clone.sh
+          underlay_ws/git_clone.sh
 
       - name: local build
         run: |
           cd staging
-          ../ros_from_src/build.sh
+          underlay_ws/build.sh
 
-      - name: docker build from source 20.04
+      - name: local catkin build
         run: |
-          cd ros_from_src
-          docker build --build-arg IMAGE=ubuntu:20.04 --build-arg ROSCONSOLE=https://github.com/ros/rosconsole --build-arg PYTHON_MINOR_VERSION=8 . -t ros2004
-
-      - name: docker build from source 22.04
-        run: |
-          cd ros_from_src
-          docker build --build-arg IMAGE=ubuntu:22.04 --build-arg PYTHON_MINOR_VERSION=10 . -t ros2204
-
-      - name: docker build from source and debian 22.04
-        run: |
-          cd ros_from_src/ubuntu_2204
-          docker build  . -t ros_debian_2204
+          cd staging
+          underlay_ws/catkin.sh

.github/workflows/ubuntu_20_04_docker.yml

@@ -0,0 +1,23 @@
+name: Ubuntu 20.04 Noetic ROS build from source
+
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+  ubuntu2004:
+    runs-on: ubuntu-20.04
+    # env:
+    steps:
+      - name: git clone [email protected]:lucasw/ros_from_src
+        uses: actions/checkout@v2
+        with:
+          path: ros_from_src
+          submodules: recursive
+
+      # TODO(lucasw) probably could combine 20.04, 22.04, and 24.04 docker builds into a single action yaml
+      # with matrix branches that execute simultaneously
+      - name: docker build from source 20.04
+        run: |
+          cd ros_from_src
+          docker build --build-arg IMAGE=ubuntu:20.04 --build-arg SUBDIR=ubuntu_2004 . -t ros2004

.github/workflows/ubuntu_22_04.yml

@@ -210,9 +210,6 @@ jobs:
 
           touch other/fuse/CATKIN_IGNORE
 
-          touch other/lvr2/CATKIN_IGNORE
-          touch other/mesh_tools/CATKIN_IGNORE
-
           touch other/rtabmap/CATKIN_IGNORE
           touch other/rtabmap_ros/CATKIN_IGNORE
 

.github/workflows/ubuntu_22_04_docker.yml

@@ -0,0 +1,26 @@
+name: Ubuntu 22.04 Noetic ROS build from source in docker
+
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+  ubuntu2204docker:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: git clone [email protected]:lucasw/ros_from_src
+        uses: actions/checkout@v2
+        with:
+          path: ros_from_src
+          submodules: recursive
+
+      # TODO(lucasw) move these 22.04 builds into separate action
+      - name: docker build from source 22.04
+        run: |
+          cd ros_from_src
+          docker build --build-arg IMAGE=ubuntu:22.04 --build-arg SUBDIR=ubuntu_2404 . -t ros2204
+
+      - name: docker build from source and debian 22.04
+        run: |
+          cd ros_from_src/ubuntu_2204
+          docker build  . -t ros_debian_2204

.github/workflows/ubuntu_24_04.yml

@@ -0,0 +1,42 @@
+name: Ubuntu 24.04 Noetic ROS build from source in docker
+
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+  ubuntu2404:
+    runs-on: ubuntu-24.04
+    # env:
+    steps:
+      - name: git clone [email protected]:lucasw/ros_from_src
+        uses: actions/checkout@v4
+        with:
+          path: ros_from_src
+          submodules: recursive
+
+      - name: local apt dependencies
+        run: |
+          mkdir staging
+          cd staging
+          mkdir -p underlay_ws/src
+          cp ../ros_from_src/*sh underlay_ws
+          sudo underlay_ws/dependencies.sh
+          sudo ../ros_from_src/ubuntu_2404/dependencies.sh
+
+      - name: local git dependencies
+        run: |
+          cd staging
+          cp ../ros_from_src/*yaml underlay_ws/src
+          sed -i 's/[email protected]:/https:\/\/github.com\//' underlay_ws/src/underlay_repos.yaml
+          underlay_ws/git_clone.sh
+
+      - name: local build
+        run: |
+          cd staging
+          underlay_ws/build.sh
+
+      - name: local catkin build
+        run: |
+          cd staging
+          underlay_ws/catkin.sh

.github/workflows/ubuntu_24_04_docker.yml

@@ -0,0 +1,23 @@
+name: Ubuntu 24.04 Noetic ROS build from source in docker
+
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+  ubuntu2404docker:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: git clone [email protected]:lucasw/ros_from_src
+        uses: actions/checkout@v4
+        with:
+          path: ros_from_src
+          submodules: recursive
+
+      - name: docker build from source 24.04
+        run: |
+          cd ros_from_src
+          docker build --build-arg IMAGE=ubuntu:24.04 --build-arg SUBDIR=ubuntu_2404 . -t ros2404
+
+          # TODO(lucasw) ubuntu_2404/Dockerfile doesn't work, was depending on the now-removed
+          # apt debian science ros packages