Separate debian and RPM docker image build workflow jobs

These take a while to build, so might as well be parallel.

Signed-off-by: Brett T. Warden <bwarden@qti.qualcomm.com>

Author: bwarden

…ithub/actions/build_container/action.yml …b/actions/build_deb_container/action.yml.github/actions/build_container/action.yml renamed to .github/actions/build_deb_container/action.yml .github/actions/build_container/action.yml renamed to .github/actions/build_deb_container/action.yml

@@ -1,6 +1,6 @@
-name: Builds the container and chroots
+name: Build Debian Containers
 description: |
-  This Github Action builds the containers and sets up the chroot environment for building packages for noble and questing.
+  Builds the Debian-based containers (noble, questing, resolute, trixie, sid).
 
 inputs:
 
@@ -23,13 +23,9 @@ inputs:
 
 runs:
   using: "composite"
-  
+
   steps:
 
     - name: Build noble and questing containers
       shell: bash
       run: ./docker_deb_build.py --rebuild --no-update-check
-
-    - name: Build RPM-based containers
-      shell: bash
-      run: ./docker_rpm_build.py --rebuild --no-update-check

.github/actions/build_rpm_container/action.yml

@@ -0,0 +1,31 @@
+name: Build RPM Containers
+description: |
+  Builds the RPM-based containers.
+
+inputs:
+
+  arch:
+    description: The architecture to build for. Ex amd64, arm64, etc
+    required: true
+
+  push-to-ghcr:
+    description: Whether to push the built image to GitHub Container Registry
+    required: true
+    default: "true"
+
+  token:
+    description: PAT token
+    required: true
+
+  username:
+    description: Username for the PAT token
+    required: true
+
+runs:
+  using: "composite"
+
+  steps:
+
+    - name: Build RPM containers
+      shell: bash
+      run: ./docker_rpm_build.py --rebuild --no-update-check

.github/workflows/qcom-container-build-and-upload.yml

@@ -13,15 +13,17 @@ on:
       - main
     paths:
       - '.github/workflows/qcom-container-build-and-upload.yml'
-      - '.github/actions/build_container/action.yml'
+      - '.github/actions/build_deb_container/action.yml'
+      - '.github/actions/build_rpm_container/action.yml'
       - 'Dockerfiles/**'
 
   push:
     branches:
       - main
     paths:
       - '.github/workflows/qcom-container-build-and-upload.yml'
-      - '.github/actions/build_container/action.yml'
+      - '.github/actions/build_deb_container/action.yml'
+      - '.github/actions/build_rpm_container/action.yml'
       - 'Dockerfiles/**'
 
   workflow_dispatch:
@@ -40,15 +42,35 @@ jobs:
   # Build the arm64 natively using a self-hosted runner on an arm64 host
   # Cross compiling the image using buildx on an x86_64 host was tried but failed due to
   # issues with qemu and multiarch support in docker buildx.
-  build-image-arm64:
+  build-deb-arm64:
     runs-on: ubuntu-24.04-arm
     steps:
-      
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Build Images
-        uses: ./.github/actions/build_container
+      - name: Build Debian Images
+        uses: ./.github/actions/build_deb_container
+        with:
+          arch: arm64
+
+      - name: Upload Images
+        uses: ./.github/actions/upload_containers
+        # Only upload on trusted events that land code on main
+        if: ${{ github.event_name == 'schedule' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
+        with:
+          arch: arm64
+          push-to-ghcr: "true"
+          token: ${{ secrets.DEB_PKG_BOT_CI_TOKEN }}
+          username: ${{ vars.DEB_PKG_BOT_CI_USERNAME }}
+
+  build-rpm-arm64:
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Build RPM Images
+        uses: ./.github/actions/build_rpm_container
         with:
           arch: arm64