Merge branch 'develop' into humble-develop

usdot-fhwa-stol · Oct 15, 2024 · a01db69 · a01db69
1 parent 8c624c5
commit a01db69
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 28 deletions.
diff --git a/.github/workflows/docker-jammy.yml → .github/workflows/docker-humble.yml b/.github/workflows/docker-jammy.yml → .github/workflows/docker-humble.yml
@@ -1,15 +1,15 @@
 # This workflow will only build for Pull Requests which are opened, changed , merged 
-# that has changes in jammy folder or related files 
-name: Docker Jammy build
+# that has changes in humble folder or related files 
+name: Docker Humble build
 on:
   pull_request:
     types: [opened, synchronize, reopened]
     paths:
       - '**'
-      - '!focal/**' # Exclude focal folder
+      - '!noetic/**' # Exclude noetic folder
 jobs:
-  # Jammy 22.04 (ROS2 Humble)
-  docker-build-jammy:
+  # Ubuntu 22.04 (ROS2 Humble)
+  docker-build-humble:
     uses: usdot-fhwa-stol/actions/.github/workflows/docker.yml@main
     with:
-      file: ./jammy/Dockerfile 
+      file: ./humble/Dockerfile 
diff --git a/.github/workflows/docker-focal.yml → .github/workflows/docker-noetic.yml b/.github/workflows/docker-focal.yml → .github/workflows/docker-noetic.yml
@@ -1,15 +1,15 @@
 # This workflow will only build for Pull Requests which are opened, changed , merged 
-# that has changes in focal folder or related files 
-name: Docker Focal build
+# that has changes in noetic folder or related files 
+name: Docker Noetic build
 on:
   pull_request:
     types: [opened, synchronize, reopened]
     paths:
       - '**'
-      - '!jammy/**' # Exclude jammy folder
+      - '!humble/**' # Exclude humble folder
 jobs:
-  # Focal 20.04 (ROS1 Noetic/ ROS2 Foxy)
-  docker-build-focal:
+  # Ubuntu 20.04 (ROS1 Noetic)
+  docker-build-noetic:
     uses: usdot-fhwa-stol/actions/.github/workflows/docker.yml@main
     with:
-      file: ./focal/Dockerfile
+      file: ./noetic/Dockerfile
diff --git a/.github/workflows/dockerhub-focal.yml → .github/workflows/dockerhub-humble.yml b/.github/workflows/dockerhub-focal.yml → .github/workflows/dockerhub-humble.yml
@@ -1,6 +1,6 @@
-# This workflow will build and push official docker images for Focal OS when new push occurs 
+# This workflow will build and push official docker images for ROS Humble when new push occurs 
 # to develop, master, release branches but doesn't run any unit test or sonar scanner
-name: Docker Hub Focal build
+name: Docker Hub Humble build
 on:
   push:
     branches:
@@ -10,15 +10,15 @@ on:
     tags:
       - "carma-system-*"
     paths:
-      - '**'  # Build when there are changes in focal folder or related files
-      - '!jammy/**' # Exclude jammy folder
+      - '**' # Build when there are changes in humble folder or related files
+      - '!noetic/**' # Exclude noetic folder
 jobs:
-  # Focal 20.04 (ROS1 Noetic/ ROS2 Foxy)
-  dockerhub-focal:
+  # Ubuntu 22.04 (ROS2 Humble)
+  dockerhub-humble:
     uses: usdot-fhwa-stol/actions/.github/workflows/dockerhub.yml@main
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
     with:
-      file: ./focal/Dockerfile
-      tag_name_suffix: focal
+      file: ./humble/Dockerfile
+      tag_name_suffix: humble
diff --git a/.github/workflows/dockerhub-jammy.yml → .github/workflows/dockerhub-noetic.yml b/.github/workflows/dockerhub-jammy.yml → .github/workflows/dockerhub-noetic.yml
@@ -1,6 +1,6 @@
-# This workflow will build and push official docker images for Focal OS when new push occurs 
+# This workflow will build and push official docker images for Noetic ROS when new push occurs 
 # to develop, master, release branches but doesn't run any unit test or sonar scanner
-name: Docker Hub Jammy build
+name: Docker Hub Noetic build
 on:
   push:
     branches:
@@ -10,15 +10,15 @@ on:
     tags:
       - "carma-system-*"
     paths:
-      - '**' # Build when there are changes in jammy folder or related files
-      - '!focal/**' # Exclude focal folder
+      - '**'  # Build when there are changes in noetic folder or related files
+      - '!humble/**' # Exclude humble folder
 jobs:
-  # Jammy 22.04 (ROS2 Humble)
-  dockerhub-jammy:
+  # Ubuntu 20.04 (ROS1 Noetic)
+  dockerhub-noetic:
     uses: usdot-fhwa-stol/actions/.github/workflows/dockerhub.yml@main
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
     with:
-      file: ./jammy/Dockerfile
-      tag_name_suffix: jammy
+      file: ./noetic/Dockerfile
+      tag_name_suffix: noetic